From aa3d47178b95581af9ac763eff5194eb4397c2d2 Mon Sep 17 00:00:00 2001 From: mmusich Date: Fri, 23 Jun 2023 08:39:28 +0200 Subject: [PATCH] add RECONANORUN3_ZB_reHLT and HARVESTRUN3_ZB relval steps and use them for 2022 data workflows, in order to employ the @rerecoZeroBias DQM sequence --- .../PyReleaseValidation/python/relval_standard.py | 12 ++++++------ .../PyReleaseValidation/python/relval_steps.py | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index f28476132a136..74a9614fd4464 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -452,7 +452,7 @@ ### run3 (2022) ### workflows[140.001] = ['',['RunMinimumBias2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] workflows[140.002] = ['',['RunSingleMuon2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] -workflows[140.003] = ['',['RunZeroBias2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] +workflows[140.003] = ['',['RunZeroBias2022A','HLTDR3_2023','RECONANORUN3_ZB_reHLT','HARVESTRUN3_ZB']] workflows[140.004] = ['',['RunBTagMu2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] workflows[140.005] = ['',['RunJetHT2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] workflows[140.006] = ['',['RunDisplacedJet2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] @@ -464,7 +464,7 @@ workflows[140.021] = ['',['RunMinimumBias2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] workflows[140.022] = ['',['RunSingleMuon2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] -workflows[140.023] = ['',['RunZeroBias2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] +workflows[140.023] = ['',['RunZeroBias2022B','HLTDR3_2023','RECONANORUN3_ZB_reHLT','HARVESTRUN3_ZB']] workflows[140.024] = ['',['RunBTagMu2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] workflows[140.025] = ['',['RunJetHT2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] workflows[140.026] = ['',['RunDisplacedJet2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] @@ -475,7 +475,7 @@ workflows[140.031] = ['',['RunMuonEG2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] workflows[140.042] = ['',['RunSingleMuon2022C','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] -workflows[140.043] = ['',['RunZeroBias2022C','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] +workflows[140.043] = ['',['RunZeroBias2022C','HLTDR3_2023','RECONANORUN3_ZB_reHLT','HARVESTRUN3_ZB']] workflows[140.044] = ['',['RunBTagMu2022C','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] workflows[140.045] = ['',['RunJetHT2022C','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] workflows[140.046] = ['',['RunDisplacedJet2022C','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] @@ -486,7 +486,7 @@ workflows[140.051] = ['',['RunMuonEG2022C','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] workflows[140.062] = ['',['RunMuon2022D','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] -workflows[140.063] = ['',['RunZeroBias2022D','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] +workflows[140.063] = ['',['RunZeroBias2022D','HLTDR3_2023','RECONANORUN3_ZB_reHLT','HARVESTRUN3_ZB']] workflows[140.064] = ['',['RunBTagMu2022D','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] workflows[140.065] = ['',['RunJetMET2022D','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] workflows[140.066] = ['',['RunDisplacedJet2022D','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] @@ -500,7 +500,7 @@ workflows[140.065521] = ['Run3-2023_JetMET2022D_RecoHCALOnlyCPU',['RunJetMET2022D','HLTDR3_2023','RECODR3_reHLT_HCALOnlyCPU','HARVESTRUN3_HCALOnly']] workflows[140.071] = ['',['RunMuon2022E','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] -workflows[140.072] = ['',['RunZeroBias2022E','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] +workflows[140.072] = ['',['RunZeroBias2022E','HLTDR3_2023','RECONANORUN3_ZB_reHLT','HARVESTRUN3_ZB']] workflows[140.073] = ['',['RunBTagMu2022E','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] workflows[140.074] = ['',['RunJetMET2022E','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] workflows[140.075] = ['',['RunDisplacedJet2022E','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] @@ -509,7 +509,7 @@ workflows[140.078] = ['',['RunMuonEG2022E','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']] ### run3 (2023) skims ### -workflows[140.104] = ['',['RunZeroBias2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMZEROBIASRUN3_reHLT']] +workflows[140.104] = ['',['RunZeroBias2022D','HLTDR3_2023','RECONANORUN3_ZB_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']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index b98bdd2634aec..9f5ef4936721e 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -2850,6 +2850,7 @@ def gen2021HiMix(fragment,howMuch): steps['RECODR3_reHLT_HCALOnlyGPU']=merge([step3_gpu, steps['RECODR3_reHLT_HCALOnlyCPU']]) steps['RECONANORUN3_reHLT']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@standardDQM+@miniAODDQM+@nanoAODDQM'},steps['RECODR3_reHLT']]) +steps['RECONANORUN3_ZB_reHLT']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@rerecoZeroBias+@miniAODDQM+@nanoAODDQM'},steps['RECODR3_reHLT']]) steps['RECOCOSMRUN3_reHLT']=merge([{'--scenario':'cosmics','-s':'RAW2DIGI,L1Reco,RECO,DQM','--datatier':'RECO,DQMIO','--eventcontent':'RECO,DQM'},steps['RECONANORUN3_reHLT']]) # mask away - to be removed once we'll migrate the matrix to be fully unscheduled for RECO step @@ -3424,6 +3425,7 @@ def gen2021HiMix(fragment,howMuch): steps['HARVESTRUN3']=merge([{'--data':'', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM','--era':'Run3'},steps['HARVESTDRUN3']]) +steps['HARVESTRUN3_ZB']=merge([{'--data':'', '-s':'HARVESTING:@rerecoZeroBias+@miniAODDQM+@nanoAODDQM','--era':'Run3'},steps['HARVESTDRUN3']]) steps['HARVESTRUN3_pixelTrackingOnly'] = merge([ {'-s':'HARVESTING:@pixelTrackingOnlyDQM'}, steps['HARVESTRUN3'] ]) steps['HARVESTRUN3_ECALOnly'] = merge([ {'-s':'HARVESTING:@ecal'}, steps['HARVESTRUN3'] ]) steps['HARVESTRUN3_HCALOnly'] = merge([ {'-s':'HARVESTING:@hcalOnly'}, steps['HARVESTRUN3'] ])