From 66a1dfae9a7a091868e4e488c9bc97efb1ac2d26 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 27 Sep 2023 16:54:53 +0200 Subject: [PATCH 1/3] add new scenario --- .../python/Impl/ppEra_Run3_2023_repacked.py | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Configuration/DataProcessing/python/Impl/ppEra_Run3_2023_repacked.py diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_2023_repacked.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2023_repacked.py new file mode 100644 index 0000000000000..e8eb8de6bb546 --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2023_repacked.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python3 +""" +_ppEra_Run3_2023_ + +Scenario supporting proton collisions for 2023 with updated HCAL Barrel thresholds + +""" + +import os +import sys + +from Configuration.DataProcessing.Reco import Reco +import FWCore.ParameterSet.Config as cms +from Configuration.Eras.Era_Run3_2023_cff import Run3_2023 + +from Configuration.DataProcessing.Impl.pp import pp + +class ppEra_Run3_2023_repacked(pp): + def __init__(self): + pp.__init__(self) + self.recoSeq='' + self.cbSc='pp' + self.isRepacked=True + self.eras=Run3_2023 + self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2023' ] + self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2023' ] + self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2023' ] + """ + _ppEra_Run3_2023_ + + Implement configuration building for data processing for proton + collision data taking for Run3_2023 + + """ From c9a9bdac6664e6313bbc3be1e510f9a911f660d8 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 27 Sep 2023 18:17:48 +0200 Subject: [PATCH 2/3] adding test, addressing Marco's suggestion --- .../DataProcessing/python/Impl/ppEra_Run3_2023_repacked.py | 2 +- Configuration/DataProcessing/test/run_CfgTest.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_2023_repacked.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2023_repacked.py index e8eb8de6bb546..927ed53846e9e 100644 --- a/Configuration/DataProcessing/python/Impl/ppEra_Run3_2023_repacked.py +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2023_repacked.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 """ -_ppEra_Run3_2023_ +_ppEra_Run3_2023_repacked_ Scenario supporting proton collisions for 2023 with updated HCAL Barrel thresholds diff --git a/Configuration/DataProcessing/test/run_CfgTest.sh b/Configuration/DataProcessing/test/run_CfgTest.sh index e1b7b5f2e36ff..c9c65ad5c97af 100755 --- a/Configuration/DataProcessing/test/run_CfgTest.sh +++ b/Configuration/DataProcessing/test/run_CfgTest.sh @@ -57,7 +57,7 @@ do runTest "${SCRAM_TEST_PATH}/RunPromptReco.py --scenario $scenario --reco --aod --dqmio --global-tag GLOBALTAG --lfn=/store/whatever --alcareco TkAlMinBias+SiStripCalMinBias --PhysicsSkim=@SingleMuon" done -declare -a arr=("ppEra_Run3") +declare -a arr=("ppEra_Run3" "ppEra_Run3_repacked") for scenario in "${arr[@]}" do runTest "${SCRAM_TEST_PATH}/RunPromptReco.py --scenario $scenario --reco --aod --miniaod --nanoaod --dqmio --global-tag GLOBALTAG --lfn=/store/whatever --alcareco TkAlMinBias+SiStripCalMinBias" From 6b691739c85b317985f7c458fb854562d47a0731 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 27 Sep 2023 18:42:54 +0200 Subject: [PATCH 3/3] fix tests --- Configuration/DataProcessing/test/run_CfgTest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/DataProcessing/test/run_CfgTest.sh b/Configuration/DataProcessing/test/run_CfgTest.sh index c9c65ad5c97af..52f2a79d81829 100755 --- a/Configuration/DataProcessing/test/run_CfgTest.sh +++ b/Configuration/DataProcessing/test/run_CfgTest.sh @@ -57,7 +57,7 @@ do runTest "${SCRAM_TEST_PATH}/RunPromptReco.py --scenario $scenario --reco --aod --dqmio --global-tag GLOBALTAG --lfn=/store/whatever --alcareco TkAlMinBias+SiStripCalMinBias --PhysicsSkim=@SingleMuon" done -declare -a arr=("ppEra_Run3" "ppEra_Run3_repacked") +declare -a arr=("ppEra_Run3" "ppEra_Run3_2023" "ppEra_Run3_2023_repacked") for scenario in "${arr[@]}" do runTest "${SCRAM_TEST_PATH}/RunPromptReco.py --scenario $scenario --reco --aod --miniaod --nanoaod --dqmio --global-tag GLOBALTAG --lfn=/store/whatever --alcareco TkAlMinBias+SiStripCalMinBias"