Skip to content

Commit 59a090d

Browse files
committed
Backport: add ECAL-only and HCAL-only workflows for MC and data (cms-sw#30350)
Backport cms-sw#30105: add ECAL-only workflows for data. Backport cms-sw#30136: add HCAL-only workflows for MC and data.
1 parent cc578b9 commit 59a090d

File tree

3 files changed

+62
-2
lines changed

3 files changed

+62
-2
lines changed

Configuration/PyReleaseValidation/python/relval_2017.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@
4949
10842.501,10842.502, # 10842.503,10842.504,
5050
10824.501,10824.502, # 10824.503,10824.504,
5151
10824.511,10824.512, # 10824.513,10824.514,
52-
# 10824.521,10824.522,10824.523,10824.524,
52+
10824.521,10824.522, # 10824.523,10824.524,
5353
11650.0,11634.0,11646.0,11640.0,11834.0,11834.99,11846.0,12024.0,
5454
11634.1,11634.5,11634.7,
5555
11650.501,11650.502, # 11650.503,11650.504,
5656
11634.501,11634.502, # 11634.503,11634.504,
5757
11634.511,11634.512, # 11634.513,11634.514,
58-
# 11634.521,11634.522,11634.523,11634.524,
58+
11634.521,11634.522, # 11634.523,11634.524,
5959
12434.0,12634.0,12634.99,
6060
12834.0,13034.0,13034.99]
6161
for numWF in numWFIB:

Configuration/PyReleaseValidation/python/relval_steps.py

+3
Original file line numberDiff line numberDiff line change
@@ -2318,6 +2318,8 @@ def gen2021HiMix(fragment,howMuch):
23182318
steps['RECODR2_2018reHLT_Patatrack_PixelOnlyGPU']=merge([step3_gpu, steps['RECODR2_2018reHLT_Prompt_pixelTrackingOnly']])
23192319
steps['RECODR2_2018reHLT_ECALOnlyCPU']=merge([{'-s': 'RAW2DIGI:RawToDigi_ecalOnly,RECO:reconstruction_ecalOnly,DQM:@ecalOnly'},steps['RECODR2_2018reHLT_Prompt']])
23202320
steps['RECODR2_2018reHLT_ECALOnlyGPU']=merge([step3_gpu, steps['RECODR2_2018reHLT_ECALOnlyCPU']])
2321+
steps['RECODR2_2018reHLT_HCALOnlyCPU']=merge([{'-s': 'RAW2DIGI:RawToDigi_hcalOnly,RECO:reconstruction_hcalOnly,DQM:@hcalOnly+@hcal2Only'},steps['RECODR2_2018reHLT_Prompt']])
2322+
steps['RECODR2_2018reHLT_HCALOnlyGPU']=merge([step3_gpu, steps['RECODR2_2018reHLT_HCALOnlyCPU']])
23212323
steps['RECODR2_2018reHLT_Offline']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2018reHLT']])
23222324
steps['RECODR2_2018reHLT_ZBOffline']=merge([{'--conditions':'auto:run2_data','-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBias+@ExtraHLT+@miniAODDQM'},steps['RECODR2_2018reHLT']])
23232325
steps['RECODR2_2018reHLT_skimEGamma_Prompt_L1TEgDQM']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2018reHLT_skimEGamma_L1TEgDQM']])
@@ -2674,6 +2676,7 @@ def gen2021HiMix(fragment,howMuch):
26742676
steps['HARVEST2018_L1TMuDQM_Prompt'] = merge([ {'-s':'HARVESTING:@standardDQMFakeHLT+@miniAODDQM+@L1TMuon'}, steps['HARVEST2018_Prompt'] ])
26752677
steps['HARVEST2018_pixelTrackingOnly'] = merge([ {'-s':'HARVESTING:@pixelTrackingOnlyDQM'}, steps['HARVEST2018'] ])
26762678
steps['HARVEST2018_ECALOnly'] = merge([ {'-s':'HARVESTING:@ecal'}, steps['HARVEST2018'] ])
2679+
steps['HARVEST2018_HCALOnly'] = merge([ {'-s':'HARVESTING:@hcalOnly'}, steps['HARVEST2018'] ])
26772680
steps['HARVEST2018_hBStar'] = merge([ {'--era' : 'Run2_2018_highBetaStar'}, steps['HARVEST2018'] ])
26782681
steps['HARVEST2018_HEfail'] = merge([ {'--conditions':'auto:run2_data_HEfail'}, steps['HARVEST2018'] ])
26792682
steps['HARVEST2018_BadHcalMitig'] = merge([ {'--era' : 'Run2_2018,pf_badHcalMitigation','--conditions':'auto:run2_data_HEfail'}, steps['HARVEST2018'] ])

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

+57
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,63 @@ def condition_(self, fragment, stepList, key, hasHarvest):
420420
'--procModifiers': 'gpu'
421421
}
422422

423+
class UpgradeWorkflowPatatrack_HCALOnlyCPU(UpgradeWorkflowPatatrack):
424+
def setup_(self, step, stepName, stepDict, k, properties):
425+
if 'Reco' in step:
426+
stepDict[stepName][k] = merge([self.step3, stepDict[step][k]])
427+
elif 'HARVEST' in step:
428+
stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@hcalOnlyValidation+@hcalOnly+@hcal2Only'}, stepDict[step][k]])
429+
430+
def condition_(self, fragment, stepList, key, hasHarvest):
431+
return '2018' in key or '2021' in key
432+
433+
upgradeWFs['PatatrackHCALOnlyCPU'] = UpgradeWorkflowPatatrack_HCALOnlyCPU(
434+
steps = [
435+
'RecoFull',
436+
'HARVESTFull',
437+
'RecoFullGlobal',
438+
'HARVESTFullGlobal',
439+
],
440+
PU = [],
441+
suffix = 'Patatrack_HCALOnlyCPU',
442+
offset = 0.521,
443+
)
444+
445+
upgradeWFs['PatatrackHCALOnlyCPU'].step3 = {
446+
'-s': 'RAW2DIGI:RawToDigi_hcalOnly,RECO:reconstruction_hcalOnly,VALIDATION:@hcalOnlyValidation,DQM:@hcalOnly+@hcal2Only',
447+
'--datatier': 'GEN-SIM-RECO,DQMIO',
448+
'--eventcontent': 'RECOSIM,DQM',
449+
}
450+
451+
class UpgradeWorkflowPatatrack_HCALOnlyGPU(UpgradeWorkflowPatatrack):
452+
def setup_(self, step, stepName, stepDict, k, properties):
453+
if 'Reco' in step:
454+
stepDict[stepName][k] = merge([self.step3, stepDict[step][k]])
455+
elif 'HARVEST' in step:
456+
stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@hcalOnlyValidation+@hcalOnly+@hcal2Only'}, stepDict[step][k]])
457+
458+
def condition_(self, fragment, stepList, key, hasHarvest):
459+
return '2018' in key or '2021' in key
460+
461+
upgradeWFs['PatatrackHCALOnlyGPU'] = UpgradeWorkflowPatatrack_HCALOnlyGPU(
462+
steps = [
463+
'RecoFull',
464+
'HARVESTFull',
465+
'RecoFullGlobal',
466+
'HARVESTFullGlobal',
467+
],
468+
PU = [],
469+
suffix = 'Patatrack_HCALOnlyGPU',
470+
offset = 0.522,
471+
)
472+
473+
upgradeWFs['PatatrackHCALOnlyGPU'].step3 = {
474+
'-s': 'RAW2DIGI:RawToDigi_hcalOnly,RECO:reconstruction_hcalOnly,VALIDATION:@hcalOnlyValidation,DQM:@hcalOnly+@hcal2Only',
475+
'--datatier': 'GEN-SIM-RECO,DQMIO',
476+
'--eventcontent': 'RECOSIM,DQM',
477+
'--procModifiers': 'gpu'
478+
}
479+
423480
# end of Patatrack workflows
424481

425482
class UpgradeWorkflow_ProdLike(UpgradeWorkflow):

0 commit comments

Comments
 (0)