Skip to content

Commit

Permalink
Use HLT:@relval2023 in 2023/24 MC and Run-3 data RelVals
Browse files Browse the repository at this point in the history
  • Loading branch information
@missirol
missirol committed Mar 9, 2023
1 parent e733bb5 commit b7e1d59
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 66 deletions.
1 change: 1 addition & 0 deletions Configuration/HLT/python/autoHLT.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
'relval2017' : 'Fake2',
'relval2018' : 'Fake2',
'relval2022' : '2022v15',
'relval2023' : 'GRun',
'relval2026' : '75e33',
'test' : 'GRun',
}
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/MatrixInjector.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ def get_wmsplit():
wmsplit['HYBRIDZSHI2015'] = 1
wmsplit['RECOHID15'] = 1
wmsplit['RECOHID18'] = 1
wmsplit['HLTDR3_2022'] = 1
wmsplit['HLTDR3_2023'] = 1
wmsplit['RECONANORUN3_reHLT'] = 1
wmsplit['HARVESTRUN3'] = 1
# automate for phase 2
Expand Down
122 changes: 61 additions & 61 deletions Configuration/PyReleaseValidation/python/relval_standard.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,72 +443,72 @@
workflows[136.9] = ['', ['RunDoubleMuon2016C', 'RAWRECOTE16', 'RAWRECOLHECLEANTE16', 'EMBEDHADTE16', 'EMBEDMINIAOD16']]

### run 2021 collisions ###
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.001] = ['RunMinimumBias2021',['RunMinimumBias2021','HLTDR3_2023','RECODR3_reHLT_MinBiasOffline','HARVESTD2021MB_reHLT']]
workflows[139.002] = ['',['RunZeroBias2021','HLTDR3_2023','RECODR3_reHLT_ZBOffline','HARVESTD2021ZB_reHLT']]
workflows[139.003] = ['',['RunHLTPhy2021','HLTDR3_2023','RECODR3_reHLT_HLTPhysics_Offline','HARVESTD2021HLTPhy_reHLT']]
workflows[139.004] = ['',['RunNoBPTX2021','HLTDR3_2023','RECODR3_reHLT_AlCaTkCosmics_Offline','HARVESTDR3_reHLT']]
workflows[139.005] = ['',['AlCaPhiSym2021','RECOALCAECALPHISYMDR3','ALCAECALPHISYM']]

### run3 (2022) ###
workflows[140.001] = ['',['RunMinimumBias2022A','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.002] = ['',['RunSingleMuon2022A','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.003] = ['',['RunZeroBias2022A','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.004] = ['',['RunBTagMu2022A','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.005] = ['',['RunJetHT2022A','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.006] = ['',['RunDisplacedJet2022A','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.007] = ['',['RunMET2022A','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.008] = ['',['RunEGamma2022A','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.009] = ['',['RunTau2022A','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.010] = ['',['RunDoubleMuon2022A','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.011] = ['',['RunMuonEG2022A','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]

workflows[140.021] = ['',['RunMinimumBias2022B','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.022] = ['',['RunSingleMuon2022B','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.023] = ['',['RunZeroBias2022B','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.024] = ['',['RunBTagMu2022B','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.025] = ['',['RunJetHT2022B','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.026] = ['',['RunDisplacedJet2022B','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.027] = ['',['RunMET2022B','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.028] = ['',['RunEGamma2022B','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.029] = ['',['RunTau2022B','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.030] = ['',['RunDoubleMuon2022B','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.031] = ['',['RunMuonEG2022B','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]

workflows[140.042] = ['',['RunSingleMuon2022C','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.043] = ['',['RunZeroBias2022C','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.044] = ['',['RunBTagMu2022C','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.045] = ['',['RunJetHT2022C','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.046] = ['',['RunDisplacedJet2022C','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.047] = ['',['RunMET2022C','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.048] = ['',['RunEGamma2022C','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.049] = ['',['RunTau2022C','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.050] = ['',['RunDoubleMuon2022C','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.051] = ['',['RunMuonEG2022C','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]

workflows[140.062] = ['',['RunMuon2022D','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.063] = ['',['RunZeroBias2022D','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.064] = ['',['RunBTagMu2022D','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.065] = ['',['RunJetMET2022D','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.066] = ['',['RunDisplacedJet2022D','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.067] = ['',['RunEGamma2022D','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.068] = ['',['RunTau2022D','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.069] = ['',['RunMuonEG2022D','HLTDR3_2022','RECONANORUN3_reHLT','HARVESTRUN3']]
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.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']]
workflows[140.007] = ['',['RunMET2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.008] = ['',['RunEGamma2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.009] = ['',['RunTau2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.010] = ['',['RunDoubleMuon2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.011] = ['',['RunMuonEG2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]

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.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']]
workflows[140.027] = ['',['RunMET2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.028] = ['',['RunEGamma2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.029] = ['',['RunTau2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.030] = ['',['RunDoubleMuon2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
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.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']]
workflows[140.047] = ['',['RunMET2022C','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.048] = ['',['RunEGamma2022C','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.049] = ['',['RunTau2022C','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.050] = ['',['RunDoubleMuon2022C','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
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.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']]
workflows[140.067] = ['',['RunEGamma2022D','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
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_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']]
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']]
#workflows[140.118] = ['',['RunParkingBPH2022B','HLTDR3_2023','RECONANORUN3_reHLT','SKIMPARKINGBPHRUN3_reHLT']]

### fastsim ###
workflows[5.1] = ['TTbarFS', ['TTbarFS','HARVESTFS']]
Expand Down
4 changes: 2 additions & 2 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1996,8 +1996,8 @@ def lhegensim2018ml(fragment,howMuch):
hltKey2018='relval2018'
steps['HLTDR2_2018']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2018,},{'--conditions':'auto:run2_hlt_relval'},{'--era' : 'Run2_2018'},steps['HLTD'] ] )

hltKey2022='relval2022'
steps['HLTDR3_2022']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2022,},{'--conditions':'auto:run3_hlt_relval'},{'--era' : 'Run3'},steps['HLTD'] ] )
hltKey2023='relval2023'
steps['HLTDR3_2023']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2023,},{'--conditions':'auto:run3_hlt_relval'},{'--era' : 'Run3'},steps['HLTD'] ] )

# special setting for lumi section boundary crossing in RunEGamma2018Dml
steps['HLTDR2_2018ml']=merge( [ {'--customise_commands':'"process.source.skipEvents=cms.untracked.uint32(7000)"'},steps['HLTDR2_2018'] ] )
Expand Down
4 changes: 2 additions & 2 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2285,15 +2285,15 @@ def condition(self, fragment, stepList, key, hasHarvest):
'2023' : {
'Geom' : 'DB:Extended',
'GT' : 'auto:phase1_2023_realistic',
'HLTmenu': '@relval2022',
'HLTmenu': '@relval2023',
'Era' : 'Run3',
'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision',
'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
},
'2024' : {
'Geom' : 'DB:Extended',
'GT' : 'auto:phase1_2024_realistic',
'HLTmenu': '@relval2022',
'HLTmenu': '@relval2023',
'Era' : 'Run3',
'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision',
'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
Expand Down

0 comments on commit b7e1d59

Please sign in to comment.