From bcc7fa059c8daa82751d1f3576a70fb1999d561a Mon Sep 17 00:00:00 2001 From: pu-sheng Date: Tue, 2 Aug 2022 04:45:02 +0200 Subject: [PATCH 1/4] Update the autoSkim.py for new HLT menu v1.3 --- Configuration/Skimming/python/autoSkim.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Configuration/Skimming/python/autoSkim.py b/Configuration/Skimming/python/autoSkim.py index b584b0121e7ea..84f241133e385 100644 --- a/Configuration/Skimming/python/autoSkim.py +++ b/Configuration/Skimming/python/autoSkim.py @@ -1,12 +1,10 @@ autoSkim = { 'BTagMu' : 'LogError+LogErrorMonitor', - 'JetHT' : 'JetHTJetPlusHOFilter+LogError+LogErrorMonitor', 'DisplacedJet' : 'EXODisplacedJet+EXODelayedJet+EXODTCluster+EXOCSCCluster+LogError+LogErrorMonitor', - 'MET' : 'EXOHighMET+EXODelayedJetMET+LogError+LogErrorMonitor', + 'JETMET' : 'JetHTJetPlusHOFilter+EXOHighMET+EXODelayedJetMET+LogError+LogErrorMonitor', 'EGamma':'ZElectron+WElectron+EXOMONOPOLE+LogError+LogErrorMonitor', 'Tau' : 'LogError+LogErrorMonitor', - 'SingleMuon' : 'ZMu+LogError+LogErrorMonitor', - 'DoubleMuon' : 'LogError+LogErrorMonitor', + 'Muon' : 'ZMu+LogError+LogErrorMonitor', 'MuonEG' : 'TopMuEG+LogError+LogErrorMonitor', 'NoBPTX' : 'EXONoBPTXSkim+LogError+LogErrorMonitor', 'HcalNZS' : 'LogError+LogErrorMonitor', @@ -14,7 +12,6 @@ 'ZeroBias' : 'LogError+LogErrorMonitor', 'Commissioning' : 'EcalActivity+LogError+LogErrorMonitor', 'Cosmics':'CosmicSP+CosmicTP+LogError+LogErrorMonitor', - 'ParkingBPH':'SkimBPark+LogError+LogErrorMonitor', 'MonteCarlo':'EXODisappTrk+LogError+LogErrorMonitor', } From 5ff90596002476df2abb3e1ce1f3ffa283ef2063 Mon Sep 17 00:00:00 2001 From: pu-sheng Date: Wed, 3 Aug 2022 05:27:32 +0200 Subject: [PATCH 2/4] Fix JetMET PD name --- Configuration/Skimming/python/autoSkim.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/Skimming/python/autoSkim.py b/Configuration/Skimming/python/autoSkim.py index 84f241133e385..2539a6f55c413 100644 --- a/Configuration/Skimming/python/autoSkim.py +++ b/Configuration/Skimming/python/autoSkim.py @@ -1,7 +1,7 @@ autoSkim = { 'BTagMu' : 'LogError+LogErrorMonitor', 'DisplacedJet' : 'EXODisplacedJet+EXODelayedJet+EXODTCluster+EXOCSCCluster+LogError+LogErrorMonitor', - 'JETMET' : 'JetHTJetPlusHOFilter+EXOHighMET+EXODelayedJetMET+LogError+LogErrorMonitor', + 'JetMET' : 'JetHTJetPlusHOFilter+EXOHighMET+EXODelayedJetMET+LogError+LogErrorMonitor', 'EGamma':'ZElectron+WElectron+EXOMONOPOLE+LogError+LogErrorMonitor', 'Tau' : 'LogError+LogErrorMonitor', 'Muon' : 'ZMu+LogError+LogErrorMonitor', From 368efa8e4bc64eb0f4173f0ea2953fabfbc19630 Mon Sep 17 00:00:00 2001 From: pu-sheng Date: Thu, 4 Aug 2022 04:10:05 +0200 Subject: [PATCH 3/4] Fix unused PD name in relval_standard.py --- Configuration/PyReleaseValidation/python/relval_standard.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 006548e91c630..c527d7c70840e 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -461,15 +461,13 @@ workflows[140.002] = ['',['RunZeroBias2022B','HLTRUN3','RECONANORUN3','HARVESTRUN3']] ### run3 (2022) skims ### -workflows[140.103] = ['',['RunSingleMuon2022B','HLTRUN3','RECONANORUN3','SKIMSINGLEMUONRUN3']] workflows[140.104] = ['',['RunZeroBias2022B','HLTRUN3','RECONANORUN3','SKIMZEROBIASRUN3']] workflows[140.105] = ['',['RunBTagMu2022B','HLTRUN3','RECONANORUN3','SKIMBTAGMURUN3']] -workflows[140.106] = ['',['RunJetHT2022B','HLTRUN3','RECONANORUN3','SKIMJETHTRUN3']] +workflows[140.106] = ['',['RunJetHT2022B','HLTRUN3','RECONANORUN3','SKIMJETMETRUN3']] workflows[140.107] = ['',['RunDisplacedJet2022B','HLTRUN3','RECONANORUN3','SKIMDISPLACEDJETRUN3']] -workflows[140.108] = ['',['RunMET2022B','HLTRUN3','RECONANORUN3','SKIMMETRUN3']] workflows[140.109] = ['',['RunEGamma2022B','HLTRUN3','RECONANORUN3','SKIMEGAMMARUN3']] workflows[140.110] = ['',['RunTau2022B','HLTRUN3','RECONANORUN3','SKIMTAURUN3']] -workflows[140.111] = ['',['RunDoubleMuon2022B','HLTRUN3','RECONANORUN3','SKIMDOUBLEMUONRUN3']] +workflows[140.111] = ['',['RunDoubleMuon2022B','HLTRUN3','RECONANORUN3','SKIMMUONRUN3']] workflows[140.112] = ['',['RunMuonEG2022B','HLTRUN3','RECONANORUN3','SKIMMUONEGRUN3']] workflows[140.113] = ['',['RunNoBPTX2022B','HLTRUN3','RECONANORUN3','SKIMNOBPTXRUN3']] workflows[140.114] = ['',['RunHcalNZS2022B','HLTRUN3','RECONANORUN3','SKIMHCALNZSRUN3']] From 28675f5af095efc308452018e37b52f97a27cfd1 Mon Sep 17 00:00:00 2001 From: pu-sheng Date: Fri, 5 Aug 2022 03:19:40 +0200 Subject: [PATCH 4/4] Fix unit test scenario issue --- Configuration/DataProcessing/test/run_CfgTest.sh | 3 ++- Configuration/Skimming/python/autoSkim.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Configuration/DataProcessing/test/run_CfgTest.sh b/Configuration/DataProcessing/test/run_CfgTest.sh index 7d476cc94f919..238d39fb95971 100755 --- a/Configuration/DataProcessing/test/run_CfgTest.sh +++ b/Configuration/DataProcessing/test/run_CfgTest.sh @@ -51,7 +51,7 @@ do runTest "${LOCAL_TEST_DIR}/RunDQMHarvesting.py --scenario $scenario --lfn /store/whatever --run 12345 --dataset /A/B/C --global-tag GLOBALTAG" done -declare -a arr=("ppEra_Run2_2018" "ppEra_Run2_2018_highBetaStar" "ppEra_Run2_2018_pp_on_AA" "ppEra_Run3") +declare -a arr=("ppEra_Run2_2018" "ppEra_Run2_2018_highBetaStar" "ppEra_Run2_2018_pp_on_AA") for scenario in "${arr[@]}" do runTest "${LOCAL_TEST_DIR}/RunPromptReco.py --scenario $scenario --reco --aod --miniaod --dqmio --global-tag GLOBALTAG --lfn=/store/whatever --alcareco TkAlMinBias+SiStripCalMinBias" @@ -62,6 +62,7 @@ declare -a arr=("ppEra_Run3") for scenario in "${arr[@]}" do runTest "${LOCAL_TEST_DIR}/RunPromptReco.py --scenario $scenario --reco --aod --miniaod --nanoaod --dqmio --global-tag GLOBALTAG --lfn=/store/whatever --alcareco TkAlMinBias+SiStripCalMinBias" + runTest "${LOCAL_TEST_DIR}/RunPromptReco.py --scenario $scenario --reco --aod --dqmio --global-tag GLOBALTAG --lfn=/store/whatever --alcareco TkAlMinBias+SiStripCalMinBias --PhysicsSkim=@Muon" done diff --git a/Configuration/Skimming/python/autoSkim.py b/Configuration/Skimming/python/autoSkim.py index 2539a6f55c413..ce3d995be9ee4 100644 --- a/Configuration/Skimming/python/autoSkim.py +++ b/Configuration/Skimming/python/autoSkim.py @@ -13,6 +13,9 @@ 'Commissioning' : 'EcalActivity+LogError+LogErrorMonitor', 'Cosmics':'CosmicSP+CosmicTP+LogError+LogErrorMonitor', 'MonteCarlo':'EXODisappTrk+LogError+LogErrorMonitor', + + # Used in unit test scenario ppEra_Run2_2018 + 'SingleMuon': 'LogError+LogErrorMonitor', } autoSkimRunII = {