@@ -1830,7 +1830,13 @@ def setup_(self, step, stepName, stepDict, k, properties):
18301830 if ('ALCA' in step ) or ('Reco' in step ) or ('HLT' in step ):
18311831 stepDict [stepName ][k ] = None
18321832 elif 'DigiTrigger' in step :
1833- stepDict [stepName ][k ] = merge ([self .step2 , stepDict [step ][k ]])
1833+ # Add the aging customization
1834+ mergedStep = merge ([self .step2 , stepDict [step ][k ]])
1835+ if '--customise' in mergedStep :
1836+ mergedStep ['--customise' ] += ',SLHCUpgradeSimulations/Configuration/aging.customise_aging_1000'
1837+ else :
1838+ mergedStep ['--customise' ] = 'SLHCUpgradeSimulations/Configuration/aging.customise_aging_1000'
1839+ stepDict [stepName ][k ] = mergedStep
18341840 elif 'HARVEST' in step :
18351841 stepDict [stepName ][k ] = merge ([self .step3 , stepDict [step ][k ]])
18361842 else :
@@ -2004,7 +2010,13 @@ def setup_(self, step, stepName, stepDict, k, properties):
20042010 if ('ALCA' in step ) or ('Reco' in step ) or ('HLT' in step ) or ('HARVEST' in step ):
20052011 stepDict [stepName ][k ] = None
20062012 elif 'DigiTrigger' in step :
2007- stepDict [stepName ][k ] = merge ([self .step2 , stepDict [step ][k ]])
2013+ # Add the aging customization
2014+ mergedStep = merge ([self .step2 , stepDict [step ][k ]])
2015+ if '--customise' in mergedStep :
2016+ mergedStep ['--customise' ] += ',SLHCUpgradeSimulations/Configuration/aging.customise_aging_1000'
2017+ else :
2018+ mergedStep ['--customise' ] = 'SLHCUpgradeSimulations/Configuration/aging.customise_aging_1000'
2019+ stepDict [stepName ][k ] = mergedStep
20082020 else :
20092021 stepDict [stepName ][k ] = merge ([stepDict [step ][k ]])
20102022 def condition (self , fragment , stepList , key , hasHarvest ):
@@ -2039,6 +2051,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
20392051 offset = 0.759 ,
20402052)
20412053upgradeWFs ['HLTPhaseWithNano' ].step2 = {
2054+
20422055 '-s' :'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33,NANO:@Phase2HLT' ,
20432056 '--datatier' :'GEN-SIM-DIGI-RAW,NANOAODSIM' ,
20442057 '--eventcontent' :'FEVTDEBUGHLT,NANOAODSIM'
@@ -2087,7 +2100,13 @@ def setup_(self, step, stepName, stepDict, k, properties):
20872100 if ('ALCA' in step ) or ('Reco' in step ) or ('HLT' in step ):
20882101 stepDict [stepName ][k ] = None
20892102 elif 'DigiTrigger' in step :
2090- stepDict [stepName ][k ] = merge ([self .step2 , stepDict [step ][k ]])
2103+ # Add the aging customization
2104+ mergedStep = merge ([self .step2 , stepDict [step ][k ]])
2105+ if '--customise' in mergedStep :
2106+ mergedStep ['--customise' ] += ',SLHCUpgradeSimulations/Configuration/aging.customise_aging_1000'
2107+ else :
2108+ mergedStep ['--customise' ] = 'SLHCUpgradeSimulations/Configuration/aging.customise_aging_1000'
2109+ stepDict [stepName ][k ] = mergedStep
20912110 elif 'HARVEST' in step :
20922111 stepDict [stepName ][k ] = merge ([self .step3 , stepDict [step ][k ]])
20932112 else :
0 commit comments