Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Phase-2 workflow with Phase-2 ECal trigger primitive, also with ECal component #43057

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Configuration/PyReleaseValidation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ The offsets currently in use are:
* 0.612: ECAL `phase2_ecal_devel` era, with automatic offload to GPU if available
* 0.631: ECAL component-method based digis
* 0.632: ECAL component-method based finely-sampled waveforms
* 0.633: ECAL phase2 Trigger Primitive
* 0.634: ECAL phase2 Trigger Primitive + component-method based digis
* 0.635: ECAL phase2 Trigger Primitive + component-method based finely-sampled waveforms
* 0.75: Phase-2 HLT
* 0.91: Track DNN modifier
* 0.97: Premixing stage1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1857,7 +1857,7 @@ def condition(self, fragment, stepList, key, hasHarvest):

# ECAL component
class UpgradeWorkflow_ECalComponent(UpgradeWorkflow):
def __init__(self, suffix, offset, ecalMod,
def __init__(self, suffix, offset, ecalTPPh2, ecalMod,
steps = [
'GenSim',
'GenSimHLBeamSpot',
Expand All @@ -1875,25 +1875,56 @@ def __init__(self, suffix, offset, ecalMod,
'DigiTrigger',
]):
super(UpgradeWorkflow_ECalComponent, self).__init__(steps, PU, suffix, offset)
self.__ecalTPPh2 = ecalTPPh2
self.__ecalMod = ecalMod

def setup_(self, step, stepName, stepDict, k, properties):
if 'Sim' in step or 'Digi' in step:
stepDict[stepName][k] = deepcopy(stepDict[step][k])
if 'Sim' in step:
if self.__ecalMod is not None:
stepDict[stepName][k] = merge([{'--procModifiers':self.__ecalMod},stepDict[step][k]])
if 'Digi' in step:
if self.__ecalMod is not None:
stepDict[stepName][k] = merge([{'--procModifiers':self.__ecalMod},stepDict[step][k]])
if self.__ecalTPPh2 is not None:
mods = {'--era': stepDict[step][k]['--era']+',phase2_ecal_devel,phase2_ecalTP_devel'}
stepDict[stepName][k] = merge([mods, stepDict[step][k]])

def condition(self, fragment, stepList, key, hasHarvest):
return ('2021' in key or '2023' in key or '2026' in key)

upgradeWFs['ECALComponent'] = UpgradeWorkflow_ECalComponent(
suffix = '_ecalComponent',
offset = 0.631,
ecalTPPh2 = None,
ecalMod = 'ecal_component',
)

upgradeWFs['ECALComponentFSW'] = UpgradeWorkflow_ECalComponent(
suffix = '_ecalComponentFSW',
offset = 0.632,
ecalTPPh2 = None,
ecalMod = 'ecal_component_finely_sampled_waveforms',
)

upgradeWFs['ECALTPPh2'] = UpgradeWorkflow_ECalComponent(
suffix = '_ecalTPPh2',
offset = 0.633,
ecalTPPh2 = 'phase2_ecal_devel,phase2_ecalTP_devel',
ecalMod = None,
)

upgradeWFs['ECALTPPh2Component'] = UpgradeWorkflow_ECalComponent(
suffix = '_ecalTPPh2Component',
offset = 0.634,
ecalTPPh2 = 'phase2_ecal_devel,phase2_ecalTP_devel',
ecalMod = 'ecal_component',
)

upgradeWFs['ECALTPPh2ComponentFSW'] = UpgradeWorkflow_ECalComponent(
suffix = '_ecalTPPh2ComponentFSW',
offset = 0.635,
ecalTPPh2 = 'phase2_ecal_devel,phase2_ecalTP_devel',
ecalMod = 'ecal_component_finely_sampled_waveforms',
)

Expand Down
3 changes: 2 additions & 1 deletion Configuration/StandardSequences/python/Eras.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ def __init__(self):
'phase2_common', 'phase2_tracker',
'phase2_muon', 'phase2_GEM', 'phase2_GE0',
'phase2_hgcal', 'phase2_timing', 'phase2_hfnose', 'phase2_hgcalV10', 'phase2_hgcalV11', 'phase2_hgcalV12',
'phase2_timing_layer', 'phase2_etlV4', 'phase2_hcal', 'phase2_ecal','phase2_ecal_devel',
'phase2_timing_layer', 'phase2_etlV4', 'phase2_hcal',
'phase2_ecal', 'phase2_ecal_devel', 'phase2_ecalTP_devel',
'phase2_trigger',
'phase2_squarePixels', 'phase2_3DPixels',
'trackingLowPU', 'trackingPhase1',
Expand Down