Merge pull request #46440 from mmusich/update_test_mc_run_setup_14_0_X

[14.0.X] Update `test_MC_*_setup` unit tests
cms-sw · Oct 25, 2024 · 3b12432 · 3b12432
2 parents 44d79e8 + 042134f
commit 3b12432
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/Configuration/PyReleaseValidation/test/BuildFile.xml b/Configuration/PyReleaseValidation/test/BuildFile.xml
@@ -13,11 +13,15 @@
     environment variable CMSSW_MC_SETUP_TEST_CATCH_HLT.
 -->
 
-<!-- In CMSSW_13_0_18 the auto:phase1_2023_realistic (pre BPix) is 130X_mcRun3_2023_realistic_postBPix_v1 -->
-<test name="test_MC_23_setup" command="CMSSW_MC_SETUP_TEST_CATCH_HLT=0 ${CMSSW_BASE}/src/Configuration/PyReleaseValidation/test/test_mc_setup/test_MC_setup.sh auto:phase1_2023_realistic Run3_2023 2023v12 CMSSW_13_0_19_HLT 130X_mcRun3_2023_realistic_v13 Realistic25ns13p6TeVEarly2023Collision" />
+<ifarchitecture name="el8_amd64">
+  <!-- Run this test for production arch of CMSSW_13_0_19_HLT release only -->
+  <test name="test_MC_23_setup" command="CMSSW_MC_SETUP_TEST_CATCH_HLT=0 ${CMSSW_BASE}/src/Configuration/PyReleaseValidation/test/test_mc_setup/test_MC_setup.sh auto:phase1_2023_realistic Run3_2023 2023v12 CMSSW_13_0_19_HLT 130X_mcRun3_2023_realistic_HLT_forReMC_v2 Realistic25ns13p6TeVEarly2023Collision" />
+</ifarchitecture>
 
-<!-- In CMSSW_12_4_20 the auto:phase1_2022_realistic (pre EE) is 124X_mcRun3_2022_realistic_v12 -->
-<test name="test_MC_22_setup" command="test_mc_setup/test_MC_setup.sh auto:phase1_2022_realistic Run3 2022v14 CMSSW_12_4_21_HLT 124X_mcRun3_2022_realistic_v12 Realistic25ns13p6TeVEarly2022Collision" />
+<ifarchitecture name="el8_amd64">
+  <!-- Run this test for production arch of CMSSW_12_4_22_HLT release only -->
+  <test name="test_MC_22_setup" command="CMSSW_MC_SETUP_TEST_CATCH_HLT=0 ${CMSSW_BASE}/src/Configuration/PyReleaseValidation/test/test_mc_setup/test_MC_setup.sh auto:phase1_2022_realistic Run3 2022v15 CMSSW_12_4_22_HLT 124X_mcRun3_2022_realistic_HLT_forReMC_v5 Realistic25ns13p6TeVEarly2022Collision" />
+</ifarchitecture>
 
 <!-- 
     The setups below are "standard", with everything run 

diff --git a/Configuration/PyReleaseValidation/test/test_mc_setup/test_MC_setup_reco.sh b/Configuration/PyReleaseValidation/test/test_mc_setup/test_MC_setup_reco.sh
@@ -9,10 +9,18 @@ era=$3
 
 #export SCRAM_ARCH=$scram_arch
 
-echo '> Running RAW2DIGI,L1Reco,RECO,RECOSIM + PAT steps in ' $release
+echo '> Running RAW2DIGI,L1Reco,RECO,RECOSIM + PAT steps reading input generated in ' $release
+
+# Check if release matches the pattern "CMSSW_12_4_*_HLT"
+if [[ $release == CMSSW_12_4_*_HLT ]]; then
+    echo "Release matches CMSSW_12_4_*_HLT, adding customisation for fixReading_12_4_X_Files"
+    customise_flag="IOPool/Input/fixReading_12_4_X_Files.fixReading_12_4_X_Files, Configuration/DataProcessing/Utils.addMonitoring"
+else
+    customise_flag="Configuration/DataProcessing/Utils.addMonitoring"
+fi
 
 cmsDriver.py  --python_filename reco.py --eventcontent AODSIM \
---customise Configuration/DataProcessing/Utils.addMonitoring \
+--customise $customise_flag \
 --datatier AODSIM --fileout file:step4.root \
 --conditions $conditions --step RAW2DIGI,L1Reco,RECO,RECOSIM \
 --geometry DB:Extended --filein file:step3.root --era $era \