From 825e3ace622ec4dfe3e3e25f7524ba978c0d425b Mon Sep 17 00:00:00 2001 From: Nicola Amapane Date: Fri, 2 Oct 2020 15:55:06 +0200 Subject: [PATCH 1/3] cleanup obsolete, unused standard sequences --- .../python/MagneticField_38T_PostLS1_cff.py | 13 ------------- .../python/MagneticField_AutoFromDBCurrent_cff.py | 6 ------ 2 files changed, 19 deletions(-) delete mode 100644 Configuration/StandardSequences/python/MagneticField_38T_PostLS1_cff.py delete mode 100644 Configuration/StandardSequences/python/MagneticField_AutoFromDBCurrent_cff.py diff --git a/Configuration/StandardSequences/python/MagneticField_38T_PostLS1_cff.py b/Configuration/StandardSequences/python/MagneticField_38T_PostLS1_cff.py deleted file mode 100644 index 739c9b113917b..0000000000000 --- a/Configuration/StandardSequences/python/MagneticField_38T_PostLS1_cff.py +++ /dev/null @@ -1,13 +0,0 @@ -### THIS CFF IS DEPRECATED!!!! ### -# please use MagneticField_cff.py instead - -from __future__ import print_function -print(" ##################################################################### ") -print(" # WARNING: the module # ") -print(" # Configuration.StandardSequences.MagneticField_38T_PostLS1_cff # ") -print(" # is deprecated. Please import # ") -print(" # Configuration.StandardSequences.MagneticField_cff # ") -print(" ##################################################################### ") - -from Configuration.StandardSequences.MagneticField_38T_cff import * - diff --git a/Configuration/StandardSequences/python/MagneticField_AutoFromDBCurrent_cff.py b/Configuration/StandardSequences/python/MagneticField_AutoFromDBCurrent_cff.py deleted file mode 100644 index 97ca9a181ced2..0000000000000 --- a/Configuration/StandardSequences/python/MagneticField_AutoFromDBCurrent_cff.py +++ /dev/null @@ -1,6 +0,0 @@ -# This cff is obsolete and will eventually be deprecated. -# Please replace it with -# Configuration.StandardSequences.MagneticField_cff.py -# in your setup. - -from Configuration.StandardSequences.MagneticField_cff import * From fe8e5261437959d620a4bc57abed3fea8c49a346 Mon Sep 17 00:00:00 2001 From: Nicola Amapane Date: Fri, 2 Oct 2020 16:02:28 +0200 Subject: [PATCH 2/3] Add IB tests for MagneticField --- MagneticField/Engine/test/BuildFile.xml | 5 +++ .../Engine/test/regressionTestHelper.cpp | 2 + MagneticField/Engine/test/runTest.sh | 39 +++++++++++++++++++ .../Engine/test/testMagneticField.cc | 3 ++ 4 files changed, 49 insertions(+) create mode 100644 MagneticField/Engine/test/regressionTestHelper.cpp create mode 100755 MagneticField/Engine/test/runTest.sh diff --git a/MagneticField/Engine/test/BuildFile.xml b/MagneticField/Engine/test/BuildFile.xml index acf003627dd4b..15fb3ad1efbea 100644 --- a/MagneticField/Engine/test/BuildFile.xml +++ b/MagneticField/Engine/test/BuildFile.xml @@ -11,3 +11,8 @@ + + + + + diff --git a/MagneticField/Engine/test/regressionTestHelper.cpp b/MagneticField/Engine/test/regressionTestHelper.cpp new file mode 100644 index 0000000000000..2f0e0c40064da --- /dev/null +++ b/MagneticField/Engine/test/regressionTestHelper.cpp @@ -0,0 +1,2 @@ +#include "FWCore/Utilities/interface/TestHelper.h" +RUNTEST() diff --git a/MagneticField/Engine/test/runTest.sh b/MagneticField/Engine/test/runTest.sh new file mode 100755 index 0000000000000..4cbd3a060588c --- /dev/null +++ b/MagneticField/Engine/test/runTest.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +function die { echo $1: status $2 ; exit $2; } + +echo "===== Test MF map regressions ====" + +#Note: Only the most relevant tests are left uncommented since the full set is highly redundant and time consuming. + +#Run II, 3.8T +(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DDD) || die "MF regression failure, from xml, DDD, 3.8T" $? +(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB) || die "MF regression failure, from DB, DDD, 3.8T" $? +(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DD4Hep) || die "MF regression failure, from xml, DD4hep, 3.8T" $? +(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB_DD4Hep) || die "MF regression failure, from DB, DD4hep, 3.8T" $? + +#Run I, 3.8T +#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DDD era=RunI) || die "MF regression failure, from xml, DDD, 3.8T RunI" $? +(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB era=RunI) || die "MF regression failure, from DB, DDD, 3.8T RunI" $? +#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DD4Hep era=RunI) || die "MF regression failure, from xml, DD4hep, 3.8T RunI" $? +#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB_DD4Hep era=RunI) || die "MF regression failure, from DB, DD4hep, 3.8T RunI" $? + +#Run II, 3.5T +export CURRENT=16730 +#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DDD current=$CURRENT) || die "MF regression failure, from xml, DDD, 3.5T" $? +#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB current=$CURRENT) || die "MF regression failure, from DB, DDD, 3.5T" $? +(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DD4Hep current=$CURRENT) || die "MF regression failure, from xml, DD4hep, 3.5T" $? +#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB_DD4Hep current=$CURRENT) || die "MF regression failure, from DB, DD4hep, 3.5T" $? + +#Run II, 3T +export CURRENT=14340 +(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DDD current=$CURRENT) || die "MF regression failure, from xml, DDD, 3T" $? +#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB current=$CURRENT) || die "MF regression failure, from DB, DDD, 3T" $? +#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DD4Hep current=$CURRENT) || die "MF regression failure, from xml, DD4hep, 3T" $? +#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB_DD4Hep current=$CURRENT) || die "MF regression failure, from DB, DD4hep, 3T" $? + +#Run II, 2T +export CURRENT=9500 +#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DDD current=$CURRENT) || die "MF regression failure, from xml, DDD, 2T" $? +#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB current=$CURRENT) || die "MF regression failure, from DB, DDD, 2T" $? +(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB_DD4Hep current=$CURRENT) || die "MF regression failure, from DB, DD4hep, 2T" $? diff --git a/MagneticField/Engine/test/testMagneticField.cc b/MagneticField/Engine/test/testMagneticField.cc index 5d5bf28d74bb5..b7385b5a8f79a 100644 --- a/MagneticField/Engine/test/testMagneticField.cc +++ b/MagneticField/Engine/test/testMagneticField.cc @@ -263,6 +263,9 @@ void testMagneticField::validate(string filename, string type) { << " testMagneticField::validate: tested " << count << " points " << fail << " failures; max delta = " << maxdelta << endl << endl; + if (fail != 0) + throw cms::Exception("RegressionFailure") << "MF regression found: " << fail << " failures"; + ; } } From 9c4fad1812af4f979107efedea7791481d2ccaff Mon Sep 17 00:00:00 2001 From: Nicola Amapane Date: Sat, 3 Oct 2020 08:57:54 +0200 Subject: [PATCH 3/3] Revert "cleanup obsolete, unused standard sequences". These are, unfortunately, still in use. Will target them in a future PR. --- .../python/MagneticField_38T_PostLS1_cff.py | 13 +++++++++++++ .../python/MagneticField_AutoFromDBCurrent_cff.py | 6 ++++++ 2 files changed, 19 insertions(+) create mode 100644 Configuration/StandardSequences/python/MagneticField_38T_PostLS1_cff.py create mode 100644 Configuration/StandardSequences/python/MagneticField_AutoFromDBCurrent_cff.py diff --git a/Configuration/StandardSequences/python/MagneticField_38T_PostLS1_cff.py b/Configuration/StandardSequences/python/MagneticField_38T_PostLS1_cff.py new file mode 100644 index 0000000000000..739c9b113917b --- /dev/null +++ b/Configuration/StandardSequences/python/MagneticField_38T_PostLS1_cff.py @@ -0,0 +1,13 @@ +### THIS CFF IS DEPRECATED!!!! ### +# please use MagneticField_cff.py instead + +from __future__ import print_function +print(" ##################################################################### ") +print(" # WARNING: the module # ") +print(" # Configuration.StandardSequences.MagneticField_38T_PostLS1_cff # ") +print(" # is deprecated. Please import # ") +print(" # Configuration.StandardSequences.MagneticField_cff # ") +print(" ##################################################################### ") + +from Configuration.StandardSequences.MagneticField_38T_cff import * + diff --git a/Configuration/StandardSequences/python/MagneticField_AutoFromDBCurrent_cff.py b/Configuration/StandardSequences/python/MagneticField_AutoFromDBCurrent_cff.py new file mode 100644 index 0000000000000..97ca9a181ced2 --- /dev/null +++ b/Configuration/StandardSequences/python/MagneticField_AutoFromDBCurrent_cff.py @@ -0,0 +1,6 @@ +# This cff is obsolete and will eventually be deprecated. +# Please replace it with +# Configuration.StandardSequences.MagneticField_cff.py +# in your setup. + +from Configuration.StandardSequences.MagneticField_cff import *