From df94c95d5d5e281c692775e2e8c7d7eacb9a6258 Mon Sep 17 00:00:00 2001 From: tocheng Date: Thu, 23 Jun 2022 12:21:37 +0200 Subject: [PATCH 1/2] Add PCL workflow test for Run3 udpate workflows using new 2022 data Using 2022B SingleMu data;seperate Express and Prompt ALCA split Use Run-3 data GT remove AlCaPCCZeroBiasFromRECO and AlCaPCCRandomFromRECO --- .../python/relval_production.py | 2 + .../python/relval_steps.py | 40 ++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_production.py b/Configuration/PyReleaseValidation/python/relval_production.py index 11e9028203435..bd3c3831cd354 100644 --- a/Configuration/PyReleaseValidation/python/relval_production.py +++ b/Configuration/PyReleaseValidation/python/relval_production.py @@ -12,6 +12,8 @@ workflows[1000] = [ '',['RunMinBias2011A','TIER0','SKIMD','HARVESTDfst2','ALCASPLIT']] workflows[1001] = [ '',['RunMinBias2011A','TIER0EXP','ALCAEXP','ALCAHARVDSIPIXELCALRUN1','ALCAHARVD1','ALCAHARVD2','ALCAHARVD3','ALCAHARVD4','ALCAHARVD5','ALCAHARVD7','ALCAHARVD8']] workflows[1001.2] = [ '',['RunZeroBias2017F','TIER0EXPRUN2','ALCAEXPRUN2','ALCAHARVDSIPIXELCAL','ALCAHARVDSIPIXELCALLA','ALCAHARVD4','ALCAHARVDSIPIXELALIHG']] +workflows[1001.3] = [ '',['RunSingleMuon2022B','TIER0EXPRUN3','ALCAEXPRUN3','ALCAHARVDEXPRUN3']] +workflows[1002.3] = [ '',['RunZeroBias2022B','TIER0PROMPTRUN3','ALCASPLITRUN3','ALCAHARVDEXPRUN3']] workflows[1002]=['RRD',['RunMinBias2011A','RECODR1','COPYPASTE']] workflows[1003]=['', ['RunMinBias2012A','RECODDQM','HARVESTDDQM']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index b02b8adb36e6f..872d6ffb16fcb 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -469,6 +469,15 @@ # 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]]} +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)} + + # 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]) steps['RunHLTPhy2015DHS']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2015D-v1/RAW',label='2015DHS',events=100000,location='STD', ls=Run2015DHS)} @@ -2064,8 +2073,7 @@ def lhegensim2018ml(fragment,howMuch): '--era':'Run2_2017', '--conditions':'auto:run2_data' },steps['TIER0']]) - -steps['TIER0EXPRUN3']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,ALCAPRODUCER:SiPixelCalZeroBias+SiStripCalZeroBias+SiStripCalMinBias+SiStripCalMinBiasAAG+TkAlMinBias,DQM:@express,ENDJOB', +steps['TIER0EXPRUN3']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,ALCAPRODUCER:@allForExpress,DQM:@express,ENDJOB', '--process':'RECO', '--datatier':'ALCARECO,DQMIO', '--eventcontent':'ALCARECO,DQM', @@ -2074,6 +2082,15 @@ def lhegensim2018ml(fragment,howMuch): '--conditions':'auto:run3_data_express' },steps['TIER0']]) +steps['TIER0PROMPTRUN3']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,ALCAPRODUCER:@allForPrompt+@allForExpress,DQM:@express,ENDJOB', + '--process':'RECO', + '--datatier':'ALCARECO,DQMIO', + '--eventcontent':'ALCARECO,DQM', + #'--customise':'Configuration/DataProcessing/RecoTLR.customiseExpress', + '--era':'Run3', + '--conditions':'auto:run3_data_prompt' + },steps['TIER0']]) + steps['TIER0EXPHI']={ '--conditions':'auto:run1_data', '-s':'RAW2DIGI,L1Reco,RECO,ALCAPRODUCER:@allForExpressHI,DQM,ENDJOB', '--datatier':'ALCARECO,DQMIO', @@ -2798,6 +2815,12 @@ def gen2021HiMix(fragment,howMuch): '--eventcontent':'ALCARECO', '--triggerResultsProcess': 'RECO'} +steps['ALCAEXPRUN3']={'-s':'ALCAOUTPUT:@allForPrompt+@allForExpress,ALCA:PromptCalibProd+PromptCalibProdSiStrip+PromptCalibProdSiStripGains+PromptCalibProdSiStripGainsAAG+PromptCalibProdSiStripHitEff+PromptCalibProdSiPixelAli+PromptCalibProdSiPixel+PromptCalibProdSiPixelLA+PromptCalibProdBeamSpotHP+PromptCalibProdBeamSpotHPLowPU', + '--conditions':'auto:run3_data', + '--datatier':'ALCARECO', + '--eventcontent':'ALCARECO', + '--triggerResultsProcess': 'RECO'} + steps['ALCAEXPHI']=merge([{'-s':'ALCA:PromptCalibProd+PromptCalibProdSiStrip+PromptCalibProdSiStripGains+PromptCalibProdSiStripGainsAAG', '--scenario':'HeavyIons'},steps['ALCAEXP']]) steps['ALCAEXPTE']={'-s':'ALCA:PromptCalibProdEcalPedestals', @@ -2833,6 +2856,12 @@ def gen2021HiMix(fragment,howMuch): '-s':'ALCA:EcalPhiSymByRun', '--customise':'Calibration/EcalCalibAlgos/EcalPhiSymRecoSequence_cff'} +steps['ALCASPLITRUN3']={'-s':'ALCAOUTPUT:@allForPrompt+@allForExpress,ALCA:PromptCalibProd+PromptCalibProdSiStrip+PromptCalibProdSiStripGains+PromptCalibProdSiStripGainsAAG+PromptCalibProdSiStripHitEff+PromptCalibProdSiPixelAli+PromptCalibProdSiPixel+PromptCalibProdSiPixelLA+PromptCalibProdBeamSpotHP+PromptCalibProdBeamSpotHPLowPU', + '--conditions':'auto:run3_data', + '--datatier':'ALCARECO', + '--eventcontent':'ALCARECO', + '--triggerResultsProcess': 'RECO'} + # step4 step4Defaults = { '-s' : 'ALCA:TkAlMuonIsolated+TkAlMinBias+EcalCalZElectron+EcalCalWElectron+HcalCalIsoTrk+MuAlCalIsolatedMu+MuAlZMuMu+MuAlOverlaps', '-n' : 1000, @@ -2935,6 +2964,13 @@ def gen2021HiMix(fragment,howMuch): '--data':'', '--filein':'file:PromptCalibProdEcalPedestals.root'} +steps['ALCAHARVDEXPRUN3']={'-s':'ALCAHARVEST:SiStripQuality+SiStripHitEff+SiStripGains+SiStripGainsAAG+SiPixelAli+SiPixelQuality+SiPixelLA+BeamSpotHPByRun+BeamSpotHPByLumi+BeamSpotHPLowPUByRun+BeamSpotHPLowPUByLumi', + '--conditions':'auto:run3_data', + '--scenario':'pp', + '--data':'', + '--filein':'file:PromptCalibProd.root'} + + steps['RECOHISt4']=steps['RECOHI2015'] steps['ALCANZS']=merge([{'-s':'ALCA:HcalCalMinBias','--mc':''},step4Defaults]) From 96482c8d51ea17bd11aa39362c6de25c499923d1 Mon Sep 17 00:00:00 2001 From: tocheng Date: Wed, 20 Jul 2022 05:48:34 +0200 Subject: [PATCH 2/2] Add prompt customization for prompt-like workflow --- 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 872d6ffb16fcb..94188657eb6ae 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -2086,7 +2086,7 @@ def lhegensim2018ml(fragment,howMuch): '--process':'RECO', '--datatier':'ALCARECO,DQMIO', '--eventcontent':'ALCARECO,DQM', - #'--customise':'Configuration/DataProcessing/RecoTLR.customiseExpress', + '--customise':'Configuration/DataProcessing/RecoTLR.customisePrompt', '--era':'Run3', '--conditions':'auto:run3_data_prompt' },steps['TIER0']])