Skip to content

Commit

Permalink
avoid use of auto:run*_data_relval GTs in non-reHLT wfs
Browse files Browse the repository at this point in the history
  • Loading branch information
@missirol
missirol committed Jan 11, 2023
1 parent 695660c commit c24a089
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 36 deletions.
36 changes: 18 additions & 18 deletions Configuration/PyReleaseValidation/python/relval_standard.py
View file
Expand Up @@ -443,10 +443,10 @@
workflows[136.9] = ['', ['RunDoubleMuon2016C', 'RAWRECOTE16', 'RAWRECOLHECLEANTE16', 'EMBEDHADTE16', 'EMBEDMINIAOD16']]

### run 2021 collisions ###
workflows[139.001] = ['RunMinimumBias2021',['RunMinimumBias2021','HLTDR3_2022','RECODR3_reHLT_MinBiasOffline','HARVESTD2021MB']]
workflows[139.002] = ['',['RunZeroBias2021','HLTDR3_2022','RECODR3_reHLT_ZBOffline','HARVESTD2021ZB']]
workflows[139.003] = ['',['RunHLTPhy2021','HLTDR3_2022','RECODR3_reHLT_HLTPhysics_Offline','HARVESTD2021HLTPhy']]
workflows[139.004] = ['',['RunNoBPTX2021','HLTDR3_2022','RECODR3_reHLT_AlCaTkCosmics_Offline','HARVESTDR3']]
workflows[139.001] = ['RunMinimumBias2021',['RunMinimumBias2021','HLTDR3_2022','RECODR3_reHLT_MinBiasOffline','HARVESTD2021MB_reHLT']]
workflows[139.002] = ['',['RunZeroBias2021','HLTDR3_2022','RECODR3_reHLT_ZBOffline','HARVESTD2021ZB_reHLT']]
workflows[139.003] = ['',['RunHLTPhy2021','HLTDR3_2022','RECODR3_reHLT_HLTPhysics_Offline','HARVESTD2021HLTPhy_reHLT']]
workflows[139.004] = ['',['RunNoBPTX2021','HLTDR3_2022','RECODR3_reHLT_AlCaTkCosmics_Offline','HARVESTDR3_reHLT']]
workflows[139.005] = ['',['AlCaPhiSym2021','RECOALCAECALPHISYMDR3','ALCAECALPHISYM']]

### run3 (2022) ###
Expand Down Expand Up @@ -495,20 +495,20 @@
workflows[140.069] = ['',['RunMuonEG2022D','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]

### run3 (2022) skims ###
workflows[140.104] = ['',['RunZeroBias2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMZEROBIASRUN3']]
workflows[140.105] = ['',['RunBTagMu2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMBTAGMURUN3']]
workflows[140.106] = ['',['RunJetHT2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMJETMETRUN3']]
workflows[140.107] = ['',['RunDisplacedJet2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMDISPLACEDJETRUN3']]
workflows[140.109] = ['',['RunEGamma2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMEGAMMARUN3']]
workflows[140.110] = ['',['RunTau2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMTAURUN3']]
workflows[140.111] = ['',['RunDoubleMuon2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMMUONRUN3']]
workflows[140.112] = ['',['RunMuonEG2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMMUONEGRUN3']]
workflows[140.113] = ['',['RunNoBPTX2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMNOBPTXRUN3']]
workflows[140.114] = ['',['RunHcalNZS2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMHCALNZSRUN3']]
workflows[140.115] = ['',['RunHLTPhysics2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMHLTPHYSICSRUN3']]
workflows[140.116] = ['',['RunCommissioning2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMCOMMISSIONINGRUN3']]
workflows[140.117] = ['',['RunCosmics2022B','HLTDR3_2022','RECOCOSMRUN3_reHLT','SKIMCOSMICSRUN3']]
#workflows[140.118] = ['',['RunParkingBPH2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMPARKINGBPHRUN3']]
workflows[140.104] = ['',['RunZeroBias2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMZEROBIASRUN3_reHLT']]
workflows[140.105] = ['',['RunBTagMu2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMBTAGMURUN3_reHLT']]
workflows[140.106] = ['',['RunJetHT2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMJETMETRUN3_reHLT']]
workflows[140.107] = ['',['RunDisplacedJet2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMDISPLACEDJETRUN3_reHLT']]
workflows[140.109] = ['',['RunEGamma2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMEGAMMARUN3_reHLT']]
workflows[140.110] = ['',['RunTau2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMTAURUN3_reHLT']]
workflows[140.111] = ['',['RunDoubleMuon2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMMUONRUN3_reHLT']]
workflows[140.112] = ['',['RunMuonEG2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMMUONEGRUN3_reHLT']]
workflows[140.113] = ['',['RunNoBPTX2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMNOBPTXRUN3_reHLT']]
workflows[140.114] = ['',['RunHcalNZS2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMHCALNZSRUN3_reHLT']]
workflows[140.115] = ['',['RunHLTPhysics2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMHLTPHYSICSRUN3_reHLT']]
workflows[140.116] = ['',['RunCommissioning2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMCOMMISSIONINGRUN3_reHLT']]
workflows[140.117] = ['',['RunCosmics2022B','HLTDR3_2022','RECOCOSMRUN3_reHLT','SKIMCOSMICSRUN3_reHLT']]
#workflows[140.118] = ['',['RunParkingBPH2022B','HLTDR3_2022','RECONANORUN3_reHLT','SKIMPARKINGBPHRUN3_reHLT']]

### fastsim ###
workflows[5.1] = ['TTbarFS', ['TTbarFS','HARVESTFS']]
Expand Down
39 changes: 21 additions & 18 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Expand Up @@ -2477,11 +2477,11 @@ def lhegensim2018ml(fragment,howMuch):
# Run 3
steps['RECODR3']=merge([{'--scenario':'pp',
'-s':'RAW2DIGI,L1Reco,RECO,DQM',
'--conditions':'auto:run3_data_relval',
'--conditions':'auto:run3_data',
'--era':'Run3',
'--customise':'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3'},dataReco])

steps['RECODR3_reHLT']=merge([{'--hltProcess':'reHLT'},steps['RECODR3']])
steps['RECODR3_reHLT']=merge([{'--conditions':'auto:run3_data_relval', '--hltProcess':'reHLT'},steps['RECODR3']])

steps['RECODR3Splash']=merge([{'-n': 2,
'-s': 'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM'
Expand Down Expand Up @@ -2510,12 +2510,14 @@ def lhegensim2018ml(fragment,howMuch):

# Run-3 skims
for s in autoSkim.keys():
steps['SKIM'+s.upper()+'RUN3']={'-s':'SKIM:%s'%(autoSkim[s]),
'--data':'',
'--era':'Run3',
'--scenario':'pp',
'--conditions':'auto:run3_data_relval'}
if 'Cosmics' in s: steps['SKIM'+s.upper()+'RUN3']['--scenario'] = 'cosmics'
steps['SKIM'+s.upper()+'RUN3_reHLT'] = {'-s':'SKIM:%s'%(autoSkim[s]),
'--data':'',
'--era':'Run3',
'--scenario':'pp',
'--conditions':'auto:run3_data_relval',
'--hltProcess':'reHLT'}
if 'Cosmics' in s:
steps['SKIM'+s.upper()+'RUN3_reHLT']['--scenario'] = 'cosmics'

# step1 gensim for HI mixing
step1Up2018HiMixDefaults = merge ([{'--beamspot':'MatchHI', '--pileup':'HiMixGEN', '--scenario':'HeavyIons'},hiDefaults2018_ppReco,PUHI,step1Up2018HiProdDefaults])
Expand Down Expand Up @@ -3014,7 +3016,7 @@ def gen2021HiMix(fragment,howMuch):
steps['ALCAEXPHI']=merge([{'-s':'ALCA:PromptCalibProd+PromptCalibProdSiStrip+PromptCalibProdSiStripGains+PromptCalibProdSiStripGainsAAG',
'--scenario':'HeavyIons'},steps['ALCAEXP']])
steps['ALCAEXPTE']={'-s':'ALCA:PromptCalibProdEcalPedestals',
'--conditions':'auto:run2_data_relval',
'--conditions':'auto:run2_data',
'--datatier':'ALCARECO',
'--eventcontent':'ALCARECO',
'--triggerResultsProcess': 'RECO'}
Expand Down Expand Up @@ -3188,8 +3190,8 @@ def gen2021HiMix(fragment,howMuch):
'--filetype':'DQM',
'--scenario':'pp'}

steps['HARVESTDreHLT'] = merge([ {'--conditions':'auto:run1_data_%s'%menu}, steps['HARVESTD'] ])
steps['HARVESTDR1reHLT'] = merge([ {'--conditions':'auto:run1_data_%s'%menu}, steps['HARVESTDR1'] ])
steps['HARVESTDreHLT'] = merge([ {'--conditions':'auto:run1_data_%s'%menu,'--hltProcess':'reHLT'}, steps['HARVESTD'] ])
steps['HARVESTDR1reHLT'] = merge([ {'--conditions':'auto:run1_data_%s'%menu,'--hltProcess':'reHLT'}, steps['HARVESTDR1'] ])
steps['HARVESTDR2'] = merge([ {'--conditions':'auto:run2_data_relval'}, steps['HARVESTD'] ])
steps['HARVESTDR2_skimDoubleEG'] = merge([ {'-s':'HARVESTING:@commonFakeHLT+@ecal+@egamma'}, steps['HARVESTDR2'] ])
steps['HARVESTDR2_skimJetHT'] = merge([ {'-s':'HARVESTING:@commonFakeHLT+@jetmet+@hcalOnly'}, steps['HARVESTDR2'] ])
Expand Down Expand Up @@ -3302,10 +3304,11 @@ def gen2021HiMix(fragment,howMuch):

steps['HARVESTDCRUN2']=merge([{'--conditions':'auto:run2_data','--era':'Run2_2016'},steps['HARVESTDC']])

steps['HARVESTDR3'] = merge([{'--conditions':'auto:run3_data_relval','--era':'Run3'}, steps['HARVESTD']])
steps['HARVESTD2021MB'] = merge([{'-s':'HARVESTING:@commonSiStripZeroBias+@ExtraHLT+@miniAODDQM'}, steps['HARVESTDR3'] ])
steps['HARVESTD2021ZB'] = merge([{'-s':'HARVESTING:@rerecoZeroBias+@ExtraHLT+@miniAODDQM'}, steps['HARVESTDR3'] ])
steps['HARVESTD2021HLTPhy'] = merge([{'-s':'HARVESTING:@commonReduced+@miniAODDQM'}, steps['HARVESTDR3'] ])
steps['HARVESTDR3'] = merge([{'--conditions':'auto:run3_data','--era':'Run3'}, steps['HARVESTD']])
steps['HARVESTDR3_reHLT'] = merge([{'--conditions':'auto:run3_data_relval','--hltProcess':'reHLT'}, steps['HARVESTDR3']])
steps['HARVESTD2021MB_reHLT'] = merge([{'-s':'HARVESTING:@commonSiStripZeroBias+@ExtraHLT+@miniAODDQM'}, steps['HARVESTDR3_reHLT'] ])
steps['HARVESTD2021ZB_reHLT'] = merge([{'-s':'HARVESTING:@rerecoZeroBias+@ExtraHLT+@miniAODDQM'}, steps['HARVESTDR3_reHLT'] ])
steps['HARVESTD2021HLTPhy_reHLT'] = merge([{'-s':'HARVESTING:@commonReduced+@miniAODDQM'}, steps['HARVESTDR3_reHLT'] ])

steps['HARVESTDPROMPTR3']=merge([{'--conditions':'auto:run3_data_prompt','-s':'HARVESTING:dqmHarvestingFakeHLT'},steps['HARVESTDR3']])
steps['HARVESTDEXPR3']=merge([{'--conditions':'auto:run3_data_express','--filein':'file:step2_inDQM.root'},steps['HARVESTDR3']])
Expand Down Expand Up @@ -3582,7 +3585,7 @@ def gen2021HiMix(fragment,howMuch):
'--filein':'file:step2.root',
'--secondfilein':'filelist:step1_dasquery.log'}

steps['SKIMDreHLT'] = merge([ {'--conditions':'auto:run1_data_%s'%menu,'--filein':'file:step3.root'}, steps['SKIMD'] ])
steps['SKIMDreHLT'] = merge([ {'--conditions':'auto:run1_data_%s'%menu, '--hltProcess':'reHLT', '--filein':'file:step3.root'}, steps['SKIMD'] ])

steps['SKIMCOSD']={'-s':'SKIM:all',
'--conditions':'auto:run1_data',
Expand Down Expand Up @@ -3624,7 +3627,7 @@ def gen2021HiMix(fragment,howMuch):
steps['REMINIAOD_data2016'] = merge([{'-s' : 'PAT,DQM:@miniAODDQM',
'--process' : 'PAT',
'--era' : 'Run2_2016,run2_miniAOD_80XLegacy',
'--conditions' : 'auto:run2_data_relval',
'--conditions' : 'auto:run2_data',
'--data' : '',
'--scenario' : 'pp',
'--eventcontent' : 'MINIAOD,DQM',
Expand All @@ -3634,7 +3637,7 @@ def gen2021HiMix(fragment,howMuch):
steps['REMININANO_data2016'] = merge([{'-s' : 'PAT,NANO,DQM:@miniAODDQM+@nanoAODDQM',
'--process' : 'PATnano',
'--era' : 'Run2_2016',
'--conditions' : 'auto:run2_data_relval',
'--conditions' : 'auto:run2_data',
'--data' : '',
'--scenario' : 'pp',
'--eventcontent' : 'MINIAOD,NANOEDMAOD,DQM',
Expand Down

0 comments on commit c24a089

Please sign in to comment.