diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index c4ded01d2c8e8..200d5f677df1d 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -457,8 +457,26 @@ workflows[139.005] = ['',['AlCaPhiSym2021','RECOALCAECALPHISYMDR3','ALCAECALPHISYM']] ### run3 (2022) ### -workflows[140.001] = ['',['RunMinimumBias2022','HLTRUN3','RECONANORUN3','HARVESTRUN3']] -workflows[140.002] = ['',['RunZeroBias2022','HLTRUN3','RECONANORUN3','HARVESTRUN3']] +workflows[140.001] = ['',['RunMinimumBias2022B','HLTRUN3','RECONANORUN3','HARVESTRUN3']] +workflows[140.002] = ['',['RunZeroBias2022B','HLTRUN3','RECONANORUN3','HARVESTRUN3']] + +### run3 (2022) skims ### +workflows[140.103] = ['',['RunSingleMuon2022B','HLTRUN3','RECONANORUN3','SKIMSINGLEMUONRUN3']] +workflows[140.104] = ['',['RunZeroBias2022B','HLTRUN3','RECONANORUN3','SKIMZEROBIASRUN3']] +workflows[140.105] = ['',['RunBTagMu2022B','HLTRUN3','RECONANORUN3','SKIMBTAGMURUN3']] +workflows[140.106] = ['',['RunJetHT2022B','HLTRUN3','RECONANORUN3','SKIMJETHTRUN3']] +workflows[140.107] = ['',['RunDisplacedJet2022B','HLTRUN3','RECONANORUN3','SKIMDISPLACEDJETRUN3']] +workflows[140.108] = ['',['RunMET2022B','HLTRUN3','RECONANORUN3','SKIMMETRUN3']] +workflows[140.109] = ['',['RunEGamma2022B','HLTRUN3','RECONANORUN3','SKIMEGAMMARUN3']] +workflows[140.110] = ['',['RunTau2022B','HLTRUN3','RECONANORUN3','SKIMTAURUN3']] +workflows[140.111] = ['',['RunDoubleMuon2022B','HLTRUN3','RECONANORUN3','SKIMDOUBLEMUONRUN3']] +workflows[140.112] = ['',['RunMuonEG2022B','HLTRUN3','RECONANORUN3','SKIMMUONEGRUN3']] +workflows[140.113] = ['',['RunNoBPTX2022B','HLTRUN3','RECONANORUN3','SKIMNOBPTXRUN3']] +workflows[140.114] = ['',['RunHcalNZS2022B','HLTRUN3','RECONANORUN3','SKIMHCALNZSRUN3']] +workflows[140.115] = ['',['RunHLTPhysics2022B','HLTRUN3','RECONANORUN3','SKIMHLTPHYSICSRUN3']] +workflows[140.116] = ['',['RunCommissioning2022B','HLTRUN3','RECONANORUN3','SKIMCOMMISSIONINGRUN3']] +workflows[140.117] = ['',['RunCosmics2022B','HLTRUN3','RECOCOSMRUN3','SKIMCOSMICSRUN3']] +#workflows[140.118] = ['',['RunParkingBPH2022B','HLTRUN3','RECONANORUN3','SKIMPARKINGBPHRUN3']] ### fastsim ### workflows[5.1] = ['TTbar', ['TTbarFS','HARVESTFS']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 0736df59c3819..8670eddaeba9a 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3,6 +3,7 @@ from Configuration.HLT.autoHLT import autoHLT from Configuration.AlCa.autoPCL import autoPCL +from Configuration.Skimming.autoSkim import autoSkim from .upgradeWorkflowComponents import step3_trackingOnly # step1 gensim: for run1 @@ -469,14 +470,30 @@ # UL AOD steps['RunJetHT2018D_reminiaodUL']={'INPUT':InputInfo(dataSet='/JetHT/Run2018D-12Nov2019_UL2018-v4/AOD',label='2018DrmaodUL',events=100000,location='STD', ls=Run2018D)} - -#### run3 2022B #### -Run2022A={353706: [[1, 40]]} -steps['RunSingleMuon2022A']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2022A-v1/RAW',label='2022A',events=100000,location='STD', ls=Run2022A)} -Run2022B={355130: [[1, 40]]} +#### run3 #### +Run2022B={355351: [[712, 768]]} +steps['RunMinimumBias2022B']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} +Run2022B={355680: [[21, 24]]} steps['RunSingleMuon2022B']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} steps['RunZeroBias2022B']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} - +Run2022B={355456: [[446, 467]]} +steps['RunBTagMu2022B']={'INPUT':InputInfo(dataSet='/BTagMu/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} +steps['RunNoBPTX2022B']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} +steps['RunHcalNZS2022B']={'INPUT':InputInfo(dataSet='/HcalNZS/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} +steps['RunHLTPhysics2022B']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} +steps['RunCommissioning2022B']={'INPUT':InputInfo(dataSet='/Commissioning/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} +Run2022B={355383: [[267, 269]]} +steps['RunJetHT2022B']={'INPUT':InputInfo(dataSet='/JetHT/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} +Run2022B={355727: [[55, 108]]} +steps['RunCosmics2022B']={'INPUT':InputInfo(dataSet='/Cosmics/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} +Run2022B={355680: [[21, 24]]} +steps['RunDisplacedJet2022B']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} +steps['RunMET2022B']={'INPUT':InputInfo(dataSet='/MET/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} +steps['RunEGamma2022B']={'INPUT':InputInfo(dataSet='/EGamma/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} +steps['RunTau2022B']={'INPUT':InputInfo(dataSet='/Tau/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} +steps['RunDoubleMuon2022B']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} +steps['RunMuonEG2022B']={'INPUT':InputInfo(dataSet='/MuonEG/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} +#steps['RunParkingBPH2022B']={'INPUT':InputInfo(dataSet='/ParkingBPH/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} # Highstat HLTPhysics Run2015DHS=selectedLS([258712,258713,258714,258741,258742,258745,258749,258750,259626,259637,259683,259685,259686,259721,259809,259810,259818,259820,259821,259822,259862,259890,259891]) @@ -515,10 +532,6 @@ steps['AlCaPhiSym2021']={'INPUT':InputInfo(dataSet='/AlCaPhiSym/Commissioning2021-v1/RAW',label='2021Commissioning',run=[346512],location='STD')} steps['AlCaLumiPixels2021']={'INPUT':InputInfo(dataSet='/AlCaLumiPixelsCountsExpress/Commissioning2021-v1/RAW',label='2021Commissioning',run=[346512],events=100000,location='STD')} -Run2022={353053: [[0, 100]]} -steps['RunMinimumBias2022']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2022A-v1/RAW',label='2022',events=100000,location='STD', ls=Run2022)} -steps['RunZeroBias2022']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2022A-v1/RAW',label='2022',events=100000,location='STD', ls=Run2022)} - #### Test of lumi section boundary crossing with run2 2018D #### Run2018Dml1={320822: [[1,1]] , 320823: [[1,1]]} Run2018Dml2={320822: [[1,2]]} @@ -1938,7 +1951,7 @@ def lhegensim2018ml(fragment,howMuch): hltKey2022='relval2022' steps['HLTDR3_2021']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2022,},{'--conditions':'auto:run3_hlt_relval'},{'--era':'Run3'},steps['HLTD'] ] ) -steps['HLTRUN3']=merge( [ {'-s':'HLT:@%s'%hltKey2022,},{'--conditions':'auto:run3_hlt_relval'},{'--era':'Run3'},steps['HLTD'] ] ) +steps['HLTRUN3']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2022,},{'--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'] ] ) @@ -2353,6 +2366,15 @@ def lhegensim2018ml(fragment,howMuch): '-n':'-1', '-s':'RECO:bunchSpacingProducer+ecalMultiFitUncalibRecHitTask+ecalCalibratedRecHitTask', '--customise':'Calibration/EcalCalibAlgos/EcalPhiSymRecoSequence_cff'},dataReco]) + +# Run3 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' # step1 gensim for HI mixing step1Up2018HiMixDefaults = merge ([{'--beamspot':'MatchHI', '--pileup':'HiMixGEN', '--scenario':'HeavyIons'},hiDefaults2018_ppReco,PUHI,step1Up2018HiProdDefaults]) @@ -2636,6 +2658,7 @@ def gen2021HiMix(fragment,howMuch): steps['RECODR3_AlCaTkCosmics_Offline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:EXONoBPTXSkim,PAT,ALCA:TkAlCosmicsInCollisions,DQM:@standardDQMFakeHLT+@miniAODDQM'},steps['RECODR3_2021']]) steps['RECONANORUN3']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@miniAODDQM+@nanoAODDQM'},steps['RECODR3']]) +steps['RECOCOSMRUN3']=merge([{'--scenario':'cosmics','-s':'RAW2DIGI,L1Reco,RECO,DQM','--datatier':'RECO,DQMIO','--eventcontent':'RECO,DQM'},steps['RECONANORUN3']]) steps['RECONANORUN3']['--customise'] += ',PhysicsTools/NanoAOD/V10/nano_cff.nanoAOD_customizeV10' # mask away - to be removed once we'll migrate the matrix to be fully unscheduled for RECO step