diff --git a/Configuration/HLT/python/autoHLT.py b/Configuration/HLT/python/autoHLT.py index 5b6acf523c5cd..6039fb273c95e 100644 --- a/Configuration/HLT/python/autoHLT.py +++ b/Configuration/HLT/python/autoHLT.py @@ -10,7 +10,8 @@ 'relval2016' : 'Fake2', 'relval2017' : 'Fake2', 'relval2018' : 'Fake2', - 'relval2022' : 'GRun', + 'relval2022' : '2022v15', + 'relval2023' : 'GRun', 'relval2026' : '75e33', 'test' : 'GRun', } diff --git a/Configuration/PyReleaseValidation/python/MatrixInjector.py b/Configuration/PyReleaseValidation/python/MatrixInjector.py index 113dc875589f8..1bd1b8455ad87 100644 --- a/Configuration/PyReleaseValidation/python/MatrixInjector.py +++ b/Configuration/PyReleaseValidation/python/MatrixInjector.py @@ -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 diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 998444917c5b6..e1def8b7fbc1f 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -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']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 8fade2509f051..0c94d2faa4b42 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -1987,8 +1987,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'] ] ) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index d3445fe085c38..da38232757bfb 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2313,7 +2313,7 @@ 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'], @@ -2321,7 +2321,7 @@ def condition(self, fragment, stepList, key, hasHarvest): '2024' : { 'Geom' : 'DB:Extended', 'GT' : 'auto:phase1_2024_realistic', - 'HLTmenu': '@relval2022', + 'HLTmenu': '@relval2023', 'Era' : 'Run3', 'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision', 'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'], @@ -2345,7 +2345,7 @@ def condition(self, fragment, stepList, key, hasHarvest): '2023FS' : { 'Geom' : 'DB:Extended', 'GT' : 'auto:phase1_2023_realistic', - 'HLTmenu': '@relval2022', + 'HLTmenu': '@relval2023', 'Era' : 'Run3_FastSim', 'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision', 'ScenToRun' : ['Gen','FastSimRun3','HARVESTFastRun3'],