From 96fe9773a9221c965255d09b5595ad3bc0179a7e Mon Sep 17 00:00:00 2001 From: Philipp Nattland Date: Fri, 13 Dec 2024 14:53:16 +0100 Subject: [PATCH 1/2] Addition of HLT HG Comb to relval tests --- .../python/relval_production.py | 1 + .../python/relval_steps.py | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/Configuration/PyReleaseValidation/python/relval_production.py b/Configuration/PyReleaseValidation/python/relval_production.py index aef9c3c2d6b28..97098d2668c2a 100644 --- a/Configuration/PyReleaseValidation/python/relval_production.py +++ b/Configuration/PyReleaseValidation/python/relval_production.py @@ -16,6 +16,7 @@ workflows[1001.4] = [ '',['RunDoubleMuon2022B','TIER0EXPRUN3','ALCAEXPSIPIXELALIRUN3','ALCAHARVD4','ALCAHARVDSIPIXELALIHG','ALCAHARVDSIPIXELALIHGCOMBINED']] # special workflow to run the SiPixelAli HG combined workflow workflows[1002.3] = [ '',['RunZeroBias2022B','TIER0PROMPTRUN3','ALCASPLITRUN3','ALCAHARVDEXPRUN3']] workflows[1002.4] = [ '',['RunDoubleMuon2022B','TIER0PROMPTRUN3','HARVESTPROMPTRUN3']] +workflows[1002.5] = [ '',['RunHLTMonitor2024I','ReAlCaHLT','ALCAReAlCaHLTHGComb','ALCAReAlCaHLTHGCombZMUMU','ALCAHARVDSIPIXELALIHLTHGCOMBINED']] 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 5884a86631c9f..55cd141235492 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -644,6 +644,7 @@ RunHI2023={375491: [[100, 100]]} steps['RunHIPhysicsRawPrime2023A']={'INPUT':InputInfo(dataSet='/HIPhysicsRawPrime0/HIRun2023A-v1/RAW',label='HI2023A',events=100000,location='STD', ls=RunHI2023)} +steps['RunHLTMonitor2024I']={'INPUT':InputInfo(dataSet='/HLTMonitor/Run2024I-Express-v2/FEVTHLTALL',label='2024I',events=100000,location='STD', ls={386801: [[32, 111]]})} ################################################################## ### Golden Data Steps # Reading good runs directly from the latest golden json @@ -2445,6 +2446,16 @@ def lhegensim2018ml(fragment,howMuch): '--era':'Run3', '--conditions':'auto:run3_data_express' },steps['TIER0']]) +steps['ReAlCaHLT']={'-s':'ALCA:TkAlHLTTracks+TkAlHLTTracksZMuMu', + '--conditions':'140X_dataRun3_Express_v3', + '--scenario': 'pp', + '--data': '', + '--era':'Run3_2024', + '--datatier':'ALCARECO', + '--eventcontent':'ALCARECO', + '--process':'RECO', + '--processName':'ReAlCa', + } steps['TIER0EXPCOSMICSRUN3']=merge([{'--scenario':'cosmics', '-s':'RAW2DIGI,L1Reco,RECO,ALCAPRODUCER:@allForExpressCosmics,ENDJOB', '-n':1000, @@ -2729,6 +2740,15 @@ def lhegensim2018ml(fragment,howMuch): '--filein':'file:PromptCalibProdSiPixelAliHGComb.root', '--customise':'Alignment/CommonAlignmentProducer/customizeLSNumberFilterForRelVals.lowerHitsPerStructure'} +steps['ALCAHARVDSIPIXELALIHLTHGCOMBINED']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdSiPixelAliHLTHGC']), + '--conditions':'140X_dataRun3_Express_v3', + '--scenario':'pp', + '--era':'Run3_2024', + '--data':'', + '-n':'-1', + '--filein':'file:PromptCalibProdSiPixelAliHLTHGC_0.root,file:PromptCalibProdSiPixelAliHLTHGC_1.root', + '--customise':'Alignment/CommonAlignmentProducer/customizeLSNumberFilterForRelVals.lowerHitsPerStructure'} + steps['ALCAHARVDPPSCAL']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdPPSTimingCalib']), '--conditions':'auto:run3_data_express', '--scenario':'pp', @@ -3544,6 +3564,34 @@ def gen2024HiMix(fragment,howMuch): '--datatier':'ALCARECO', '--eventcontent':'ALCARECO', '--triggerResultsProcess': 'RECO'} +steps['ALCAReAlCaHLTHGComb']={'-s':'ALCA:PromptCalibProdSiPixelAliHLTHGC', + '--conditions':'140X_dataRun3_Express_v3', + '--customise': 'Alignment/CommonAlignmentProducer/customizeLSNumberFilterForRelVals.doNotFilterLS', + '--scenario': 'pp', + '--data': '', + '--era':'Run3_2024', + '--datatier':'ALCARECO', + '--eventcontent':'ALCARECO', + '--processName=ReAlCaHLTHGC':'', + '-n':'-1', + '--filein':'file:TkAlHLTTracks.root', + '--fileout':'file:PromptCalibProdSiPixelAliHLTHGC_0.root', + '--customise_commands=process.ALCARECOTkAlZMuMuFilterForSiPixelAliHLT.throw = False;process.ALCARECOTkAlMinBiasFilterForSiPixelAliHLTHG.TriggerResultsTag = "TriggerResults::ReAlCa"':'', + '--triggerResultsProcess': 'ReAlCa'} +steps['ALCAReAlCaHLTHGCombZMUMU']={'-s':'ALCA:PromptCalibProdSiPixelAliHLTHGC', + '--conditions':'140X_dataRun3_Express_v3', + '--customise': 'Alignment/CommonAlignmentProducer/customizeLSNumberFilterForRelVals.doNotFilterLS', + '--scenario': 'pp', + '--data': '', + '--era':'Run3_2024', + '--datatier':'ALCARECO', + '--eventcontent':'ALCARECO', + '--processName=ReAlCaHLTHGC':'', + '-n':'-1', + '--filein':'file:TkAlHLTTracksZMuMu.root', + '--fileout':'file:PromptCalibProdSiPixelAliHLTHGC_1.root', + '--customise_commands=process.ALCARECOTkAlZMuMuFilterForSiPixelAliHLT.throw = False;process.ALCARECOTkAlMinBiasFilterForSiPixelAliHLTHG.TriggerResultsTag = "TriggerResults::ReAlCa"':'', + '--triggerResultsProcess': 'ReAlCa'} steps['ALCAEXPCOSMICSRUN3']={'-s':'ALCAOUTPUT:@allForExpressCosmics,ALCA:PromptCalibProdSiStrip+PromptCalibProdSiPixelLAMCS+PromptCalibProdSiStripLA', '-n':1000, '--scenario':'cosmics', From e64390f90f7bd2b1cc289b1b035659888efa617f Mon Sep 17 00:00:00 2001 From: mmusich Date: Fri, 13 Dec 2024 17:15:00 +0100 Subject: [PATCH 2/2] fixes to workflow 1002.5 --- .../python/relval_steps.py | 67 +++++++++++-------- 1 file changed, 40 insertions(+), 27 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 55cd141235492..1cb00d6601d4e 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3564,34 +3564,47 @@ def gen2024HiMix(fragment,howMuch): '--datatier':'ALCARECO', '--eventcontent':'ALCARECO', '--triggerResultsProcess': 'RECO'} -steps['ALCAReAlCaHLTHGComb']={'-s':'ALCA:PromptCalibProdSiPixelAliHLTHGC', - '--conditions':'140X_dataRun3_Express_v3', - '--customise': 'Alignment/CommonAlignmentProducer/customizeLSNumberFilterForRelVals.doNotFilterLS', - '--scenario': 'pp', - '--data': '', - '--era':'Run3_2024', - '--datatier':'ALCARECO', - '--eventcontent':'ALCARECO', - '--processName=ReAlCaHLTHGC':'', - '-n':'-1', - '--filein':'file:TkAlHLTTracks.root', - '--fileout':'file:PromptCalibProdSiPixelAliHLTHGC_0.root', - '--customise_commands=process.ALCARECOTkAlZMuMuFilterForSiPixelAliHLT.throw = False;process.ALCARECOTkAlMinBiasFilterForSiPixelAliHLTHG.TriggerResultsTag = "TriggerResults::ReAlCa"':'', - '--triggerResultsProcess': 'ReAlCa'} -steps['ALCAReAlCaHLTHGCombZMUMU']={'-s':'ALCA:PromptCalibProdSiPixelAliHLTHGC', - '--conditions':'140X_dataRun3_Express_v3', + +steps['ALCAReAlCaHLTHGComb'] = {'-s': 'ALCA:PromptCalibProdSiPixelAliHLTHGC', + '--conditions': '140X_dataRun3_Express_v3', '--customise': 'Alignment/CommonAlignmentProducer/customizeLSNumberFilterForRelVals.doNotFilterLS', - '--scenario': 'pp', - '--data': '', - '--era':'Run3_2024', - '--datatier':'ALCARECO', - '--eventcontent':'ALCARECO', - '--processName=ReAlCaHLTHGC':'', - '-n':'-1', - '--filein':'file:TkAlHLTTracksZMuMu.root', - '--fileout':'file:PromptCalibProdSiPixelAliHLTHGC_1.root', - '--customise_commands=process.ALCARECOTkAlZMuMuFilterForSiPixelAliHLT.throw = False;process.ALCARECOTkAlMinBiasFilterForSiPixelAliHLTHG.TriggerResultsTag = "TriggerResults::ReAlCa"':'', - '--triggerResultsProcess': 'ReAlCa'} + '--scenario': 'pp', + '--data': '', + '--era': 'Run3_2024', + '--datatier': 'ALCARECO', + '--eventcontent': 'ALCARECO', + '--processName': 'ReAlCaHLTHGC', + '-n': '-1', + '--filein': 'file:TkAlHLTTracks.root', + '--fileout': 'PromptCalibProdSiPixelAliHLTHGC_0.root', + '--customise_commands': '\"process.ALCARECOTkAlZMuMuFilterForSiPixelAliHLT.throw = False; ' + 'process.ALCARECOTkAlMinBiasFilterForSiPixelAliHLTHG.TriggerResultsTag = ' + '\\"TriggerResults::ReAlCa\\"; ' + 'process.ALCARECOStreamPromptCalibProdSiPixelAliHLTHGC.fileName = ' + '\\"PromptCalibProdSiPixelAliHLTHGC_0.root\\"\"', + '--triggerResultsProcess': 'ReAlCa' + } + +steps['ALCAReAlCaHLTHGCombZMUMU'] = {'-s': 'ALCA:PromptCalibProdSiPixelAliHLTHGC', + '--conditions': '140X_dataRun3_Express_v3', + '--customise': 'Alignment/CommonAlignmentProducer/customizeLSNumberFilterForRelVals.doNotFilterLS', + '--scenario': 'pp', + '--data': '', + '--era': 'Run3_2024', + '--datatier': 'ALCARECO', + '--eventcontent': 'ALCARECO', + '--processName': 'ReAlCaHLTHGC', + '-n': '-1', + '--filein': 'file:TkAlHLTTracksZMuMu.root', + '--fileout': 'PromptCalibProdSiPixelAliHLTHGC_1.root', + '--customise_commands': '\"process.ALCARECOTkAlZMuMuFilterForSiPixelAliHLT.throw = False; ' + 'process.ALCARECOTkAlMinBiasFilterForSiPixelAliHLTHG.TriggerResultsTag = ' + '\\"TriggerResults::ReAlCa\\"; ' + 'process.ALCARECOStreamPromptCalibProdSiPixelAliHLTHGC.fileName = ' + '\\"PromptCalibProdSiPixelAliHLTHGC_1.root\\"\"', + '--triggerResultsProcess': 'ReAlCa' + } + steps['ALCAEXPCOSMICSRUN3']={'-s':'ALCAOUTPUT:@allForExpressCosmics,ALCA:PromptCalibProdSiStrip+PromptCalibProdSiPixelLAMCS+PromptCalibProdSiStripLA', '-n':1000, '--scenario':'cosmics',