From 57ffe12605bf31e29a8ffc0c0bc327995fe11d87 Mon Sep 17 00:00:00 2001 From: Youying Date: Thu, 23 Mar 2023 05:41:25 +0100 Subject: [PATCH 1/2] Update autoSkim for 2023 data taking --- Configuration/Skimming/python/autoSkim.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/Configuration/Skimming/python/autoSkim.py b/Configuration/Skimming/python/autoSkim.py index d907d09c58339..72d27850ad145 100644 --- a/Configuration/Skimming/python/autoSkim.py +++ b/Configuration/Skimming/python/autoSkim.py @@ -1,10 +1,15 @@ autoSkim = { + + 'BTagMu' : 'LogError+LogErrorMonitor', - 'DisplacedJet' : 'EXODisplacedJet+EXODelayedJet+EXODTCluster+EXOCSCCluster+LogError+LogErrorMonitor', - 'JetMET' : 'JetHTJetPlusHOFilter+EXOHighMET+EXODelayedJetMET+EXODisappTrk+LogError+LogErrorMonitor', - 'EGamma':'ZElectron+WElectron+EXOMONOPOLE+EXODisappTrk+LogError+LogErrorMonitor', + 'DisplacedJet' : 'EXODisplacedJet+EXODelayedJet+EXODTCluster+EXOLLPJetHCAL+LogError+LogErrorMonitor', + 'JetMET0' : 'JetHTJetPlusHOFilter+EXOHighMET+EXODelayedJetMET+EXODisappTrk+LogError+LogErrorMonitor', + 'JetMET1' : 'JetHTJetPlusHOFilter+EXOHighMET+EXODelayedJetMET+EXODisappTrk+LogError+LogErrorMonitor', + 'EGamma0':'ZElectron+WElectron+EXOMONOPOLE+EXODisappTrk+LogError+LogErrorMonitor', + 'EGamma1':'ZElectron+WElectron+EXOMONOPOLE+EXODisappTrk+LogError+LogErrorMonitor', 'Tau' : 'EXODisappTrk+LogError+LogErrorMonitor', - 'Muon' : 'ZMu+EXODisappTrk+LogError+LogErrorMonitor', + 'Muon0' : 'ZMu+EXODisappTrk+EXOCSCCluster+EXODisappMuon+LogError+LogErrorMonitor', + 'Muon1' : 'ZMu+EXODisappTrk+EXOCSCCluster+EXODisappMuon+LogError+LogErrorMonitor', 'MuonEG' : 'TopMuEG+LogError+LogErrorMonitor', 'NoBPTX' : 'EXONoBPTXSkim+LogError+LogErrorMonitor', 'HcalNZS' : 'LogError+LogErrorMonitor', @@ -13,6 +18,12 @@ 'Commissioning' : 'EcalActivity+LogError+LogErrorMonitor', 'Cosmics':'CosmicSP+CosmicTP+LogError+LogErrorMonitor', + # These should be uncommented when 2022 data reprocessing + #'JetMET' : 'JetHTJetPlusHOFilter+EXOHighMET+EXODelayedJetMET+EXODisappTrk+LogError+LogErrorMonitor', + #'EGamma':'ZElectron+WElectron+EXOMONOPOLE+EXODisappTrk+LogError+LogErrorMonitor', + #'Muon' : 'ZMu+EXODisappTrk+LogError+LogErrorMonitor', + #'DisplacedJet' : 'EXODisplacedJet+EXODelayedJet+EXODTCluster+EXOCSCCluster+LogError+LogErrorMonitor', + # Used in unit test scenario ppEra_Run2_2018 'SingleMuon': 'LogError+LogErrorMonitor', } From 74a3f53c7d184528d08d42331e990af5f6555e8c Mon Sep 17 00:00:00 2001 From: Youying Date: Thu, 6 Apr 2023 10:32:25 +0200 Subject: [PATCH 2/2] Update workflow to fit 2023 skim config --- .../DataProcessing/test/run_CfgTest.sh | 2 +- .../python/relval_standard.py | 28 +++++++++---------- Configuration/Skimming/python/autoSkim.py | 11 ++++++-- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/Configuration/DataProcessing/test/run_CfgTest.sh b/Configuration/DataProcessing/test/run_CfgTest.sh index 9840f8d184097..52ac2211639e2 100755 --- a/Configuration/DataProcessing/test/run_CfgTest.sh +++ b/Configuration/DataProcessing/test/run_CfgTest.sh @@ -62,7 +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" + runTest "${LOCAL_TEST_DIR}/RunPromptReco.py --scenario $scenario --reco --aod --dqmio --global-tag GLOBALTAG --lfn=/store/whatever --alcareco TkAlMinBias+SiStripCalMinBias --PhysicsSkim=@Muon0" done diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index e1def8b7fbc1f..a12e27687e7f2 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -494,20 +494,20 @@ workflows[140.068] = ['',['RunTau2022D','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] workflows[140.069] = ['',['RunMuonEG2022D','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] -### run3 (2022) skims ### -workflows[140.104] = ['',['RunZeroBias2022B','HLTDR3_2023','RECONANORUN3_reHLT','SKIMZEROBIASRUN3_reHLT']] -workflows[140.105] = ['',['RunBTagMu2022B','HLTDR3_2023','RECONANORUN3_reHLT','SKIMBTAGMURUN3_reHLT']] -workflows[140.106] = ['',['RunJetHT2022B','HLTDR3_2023','RECONANORUN3_reHLT','SKIMJETMETRUN3_reHLT']] -workflows[140.107] = ['',['RunDisplacedJet2022B','HLTDR3_2023','RECONANORUN3_reHLT','SKIMDISPLACEDJETRUN3_reHLT']] -workflows[140.109] = ['',['RunEGamma2022B','HLTDR3_2023','RECONANORUN3_reHLT','SKIMEGAMMARUN3_reHLT']] -workflows[140.110] = ['',['RunTau2022B','HLTDR3_2023','RECONANORUN3_reHLT','SKIMTAURUN3_reHLT']] -workflows[140.111] = ['',['RunDoubleMuon2022B','HLTDR3_2023','RECONANORUN3_reHLT','SKIMMUONRUN3_reHLT']] -workflows[140.112] = ['',['RunMuonEG2022B','HLTDR3_2023','RECONANORUN3_reHLT','SKIMMUONEGRUN3_reHLT']] -workflows[140.113] = ['',['RunNoBPTX2022B','HLTDR3_2023','RECONANORUN3_reHLT','SKIMNOBPTXRUN3_reHLT']] -workflows[140.114] = ['',['RunHcalNZS2022B','HLTDR3_2023','RECONANORUN3_reHLT','SKIMHCALNZSRUN3_reHLT']] -workflows[140.115] = ['',['RunHLTPhysics2022B','HLTDR3_2023','RECONANORUN3_reHLT','SKIMHLTPHYSICSRUN3_reHLT']] -workflows[140.116] = ['',['RunCommissioning2022B','HLTDR3_2023','RECONANORUN3_reHLT','SKIMCOMMISSIONINGRUN3_reHLT']] -workflows[140.117] = ['',['RunCosmics2022B','HLTDR3_2023','RECOCOSMRUN3_reHLT','SKIMCOSMICSRUN3_reHLT']] +### run3 (2023) skims ### +workflows[140.104] = ['',['RunZeroBias2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMZEROBIASRUN3_reHLT']] +workflows[140.105] = ['',['RunBTagMu2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMBTAGMURUN3_reHLT']] +workflows[140.106] = ['',['RunJetMET2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMJETMET0RUN3_reHLT']] +workflows[140.107] = ['',['RunDisplacedJet2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMDISPLACEDJETRUN3_reHLT']] +workflows[140.109] = ['',['RunEGamma2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMEGAMMA0RUN3_reHLT']] +workflows[140.110] = ['',['RunTau2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMTAURUN3_reHLT']] +workflows[140.111] = ['',['RunMuon2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMMUON0RUN3_reHLT']] +workflows[140.112] = ['',['RunMuonEG2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMMUONEGRUN3_reHLT']] +workflows[140.113] = ['',['RunNoBPTX2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMNOBPTXRUN3_reHLT']] +workflows[140.114] = ['',['RunHcalNZS2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMHCALNZSRUN3_reHLT']] +workflows[140.115] = ['',['RunHLTPhysics2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMHLTPHYSICSRUN3_reHLT']] +workflows[140.116] = ['',['RunCommissioning2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMCOMMISSIONINGRUN3_reHLT']] +workflows[140.117] = ['',['RunCosmics2022D','HLTDR3_2023','RECOCOSMRUN3_reHLT','SKIMCOSMICSRUN3_reHLT']] #workflows[140.118] = ['',['RunParkingBPH2022B','HLTDR3_2023','RECONANORUN3_reHLT','SKIMPARKINGBPHRUN3_reHLT']] ### fastsim ### diff --git a/Configuration/Skimming/python/autoSkim.py b/Configuration/Skimming/python/autoSkim.py index 72d27850ad145..9b24732e91d73 100644 --- a/Configuration/Skimming/python/autoSkim.py +++ b/Configuration/Skimming/python/autoSkim.py @@ -1,6 +1,6 @@ autoSkim = { - + # Skim 2023 'BTagMu' : 'LogError+LogErrorMonitor', 'DisplacedJet' : 'EXODisplacedJet+EXODelayedJet+EXODTCluster+EXOLLPJetHCAL+LogError+LogErrorMonitor', 'JetMET0' : 'JetHTJetPlusHOFilter+EXOHighMET+EXODelayedJetMET+EXODisappTrk+LogError+LogErrorMonitor', @@ -19,10 +19,15 @@ 'Cosmics':'CosmicSP+CosmicTP+LogError+LogErrorMonitor', # These should be uncommented when 2022 data reprocessing + # Dedicated skim for 2022 #'JetMET' : 'JetHTJetPlusHOFilter+EXOHighMET+EXODelayedJetMET+EXODisappTrk+LogError+LogErrorMonitor', #'EGamma':'ZElectron+WElectron+EXOMONOPOLE+EXODisappTrk+LogError+LogErrorMonitor', - #'Muon' : 'ZMu+EXODisappTrk+LogError+LogErrorMonitor', - #'DisplacedJet' : 'EXODisplacedJet+EXODelayedJet+EXODTCluster+EXOCSCCluster+LogError+LogErrorMonitor', + #'Muon' : 'ZMu+EXODisappTrk+EXODisappMuon+LogError+LogErrorMonitor', + #'DisplacedJet' : 'EXODisplacedJet+EXODelayedJet+EXODTCluster+EXOCSCCluster+EXOLLPJetHCAL+LogError+LogErrorMonitor', + #'JetHT' : 'JetHTJetPlusHOFilter+LogError+LogErrorMonitor', + #'MET' : 'EXOHighMET+EXODelayedJetMET+EXODisappTrk+LogError+LogErrorMonitor', + #'SingleMuon' : 'ZMu+EXODisappTrk+EXODisappMuon+LogError+LogErrorMonitor', + #'DoubleMuon' : 'LogError+LogErrorMonitor', # Used in unit test scenario ppEra_Run2_2018 'SingleMuon': 'LogError+LogErrorMonitor',