From 9e8924e2dbf1826b4155d7b9abdac48c796217c0 Mon Sep 17 00:00:00 2001 From: Kirill Skovpen Date: Thu, 14 Jul 2022 09:08:54 +0200 Subject: [PATCH 1/3] add run3 wfs --- .../python/relval_standard.py | 4 ++++ .../PyReleaseValidation/python/relval_steps.py | 18 +++++++++++++++++- .../python/upgradeWorkflowComponents.py | 16 ++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 6cddea0177d05..c4ded01d2c8e8 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -456,6 +456,10 @@ workflows[139.004] = ['',['RunNoBPTX2021','HLTDR3_2021','RECODR3_AlCaTkCosmics_Offline','HARVESTDR3']] workflows[139.005] = ['',['AlCaPhiSym2021','RECOALCAECALPHISYMDR3','ALCAECALPHISYM']] +### run3 (2022) ### +workflows[140.001] = ['',['RunMinimumBias2022','HLTRUN3','RECONANORUN3','HARVESTRUN3']] +workflows[140.002] = ['',['RunZeroBias2022','HLTRUN3','RECONANORUN3','HARVESTRUN3']] + ### fastsim ### workflows[5.1] = ['TTbar', ['TTbarFS','HARVESTFS']] workflows[5.2] = ['SingleMuPt10', ['SingleMuPt10FS','HARVESTFS']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index b02b8adb36e6f..e4705a5be8817 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -506,6 +506,9 @@ 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]]} @@ -1926,6 +1929,8 @@ 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'] ] ) + # 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'] ] ) @@ -2306,7 +2311,7 @@ def lhegensim2018ml(fragment,howMuch): '--conditions':'auto:run3_data_relval', '--era':'Run3', '--customise':'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3'},dataReco]) - + steps['RECODR3Splash']=merge([{'-n': 2, '-s': 'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM' },steps['RECODR3']]) @@ -2613,6 +2618,8 @@ def gen2021HiMix(fragment,howMuch): steps['RECODR3_HLTPhysics_Offline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:TkAlMinBias+HcalCalIterativePhiSym+HcalCalIsoTrkProducerFilter+HcalCalHO+HcalCalHBHEMuonProducerFilter,DQM:@commonReduced+@miniAODDQM','--procModifiers':'siPixelQualityRawToDigi'},steps['RECODR3_2021']]) 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','--customise':'PhysicsTools/NanoAOD/V10/nano_cff.nanoAOD_customizeV10'},steps['RECODR3']]) + # mask away - to be removed once we'll migrate the matrix to be fully unscheduled for RECO step #steps['RECOmAOD']=merge([step3DefaultsUnsch]) #steps['RECOmAODUP15']=merge([step3Up2015DefaultsUnsch]) @@ -3120,6 +3127,15 @@ def gen2021HiMix(fragment,howMuch): '--era' : 'Run2_2018_pp_on_AA', '--filetype':'DQM', '-n':100},hiDefaults2018_ppReco]) + +steps['HARVESTDRUN3']={'-s':'HARVESTING:@standardDQMFakeHLT+@miniAODDQM+@nanoAODDQM', + '--conditions':'auto:run3_data', + '--data':'', + '--filetype':'DQM', + '--scenario':'pp'} + +steps['HARVESTRUN3']=merge([{'--data':'', '-s':'HARVESTING:@miniAODDQM+@nanoAODDQM'},steps['HARVESTDRUN3']]) + #MC steps['HARVEST']={'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT', '--conditions':'auto:run1_mc', diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index d1f6306849f84..7a981452f07a6 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -204,6 +204,22 @@ def condition(self, fragment, stepList, key, hasHarvest): offset = 0.0, ) +class UpgradeWorkflow_NanoV10(UpgradeWorkflow): + def setup_(self, step, stepName, stepDict, k, properties): + if stepDict[step][k] != None: + if 'RecoNano' in step: + stepDict[stepName][k] = merge([{'--customise': 'PhysicsTools/NanoAOD/V10/nano_cff.nanoAOD_customizeV10'}, stepDict[step][k]]) + def condition(self, fragment, stepList, key, hasHarvest): + return True +upgradeWFs['NanoV10'] = UpgradeWorkflow_NanoV10( + steps = [ + 'RecoNano' + ], + PU = [], + suffix = '_NanoV10', + offset = 0.602, +) + class UpgradeWorkflow_DigiNoHLT(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): if stepDict[step][k] != None: From a9dd2be1ecbf8c212ba17d78d3745a89596276f5 Mon Sep 17 00:00:00 2001 From: Kirill Skovpen Date: Mon, 18 Jul 2022 10:28:47 +0200 Subject: [PATCH 2/3] update customise opt --- Configuration/PyReleaseValidation/python/relval_steps.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index e4705a5be8817..83b9caaad33ef 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -2618,7 +2618,8 @@ def gen2021HiMix(fragment,howMuch): steps['RECODR3_HLTPhysics_Offline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:TkAlMinBias+HcalCalIterativePhiSym+HcalCalIsoTrkProducerFilter+HcalCalHO+HcalCalHBHEMuonProducerFilter,DQM:@commonReduced+@miniAODDQM','--procModifiers':'siPixelQualityRawToDigi'},steps['RECODR3_2021']]) 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','--customise':'PhysicsTools/NanoAOD/V10/nano_cff.nanoAOD_customizeV10'},steps['RECODR3']]) +steps['RECODR3']['--customise'] += ',PhysicsTools/NanoAOD/V10/nano_cff.nanoAOD_customizeV10' +steps['RECONANORUN3']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@miniAODDQM+@nanoAODDQM'},steps['RECODR3']]) # mask away - to be removed once we'll migrate the matrix to be fully unscheduled for RECO step #steps['RECOmAOD']=merge([step3DefaultsUnsch]) From cc0f57c55c835561ee9f7aeaa29761c32f813b66 Mon Sep 17 00:00:00 2001 From: Kirill Skovpen Date: Mon, 18 Jul 2022 23:13:53 +0200 Subject: [PATCH 3/3] update --- Configuration/PyReleaseValidation/python/relval_steps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 83b9caaad33ef..6527f4bea6b03 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -2618,8 +2618,8 @@ def gen2021HiMix(fragment,howMuch): steps['RECODR3_HLTPhysics_Offline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:TkAlMinBias+HcalCalIterativePhiSym+HcalCalIsoTrkProducerFilter+HcalCalHO+HcalCalHBHEMuonProducerFilter,DQM:@commonReduced+@miniAODDQM','--procModifiers':'siPixelQualityRawToDigi'},steps['RECODR3_2021']]) steps['RECODR3_AlCaTkCosmics_Offline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:EXONoBPTXSkim,PAT,ALCA:TkAlCosmicsInCollisions,DQM:@standardDQMFakeHLT+@miniAODDQM'},steps['RECODR3_2021']]) -steps['RECODR3']['--customise'] += ',PhysicsTools/NanoAOD/V10/nano_cff.nanoAOD_customizeV10' steps['RECONANORUN3']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@miniAODDQM+@nanoAODDQM'},steps['RECODR3']]) +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 #steps['RECOmAOD']=merge([step3DefaultsUnsch])