Skip to content

Add ECal-component modifiers and test workflows #42097

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.

Sign up for GitHub

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

Merged
cmsbuild merged 2 commits into from
Jul 12, 2023
Merged

Add ECal-component modifiers and test workflows #42097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2909f7a
add modifiers and wfs
Jun 26, 2023
5054bcd
update readme
Jun 26, 2023
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/ProcessModifiers/python/ecal_component_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import FWCore.ParameterSet.Config as cms

ecal_component = cms.Modifier()
3 changes: 3 additions & 0 deletions Configuration/ProcessModifiers/python/ecal_component_finely_sampled_waveforms_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import FWCore.ParameterSet.Config as cms

ecal_component_finely_sampled_waveforms = cms.Modifier()
2 changes: 2 additions & 0 deletions Configuration/PyReleaseValidation/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ The offsets currently in use are:
* 0.31: Photon energy corrections with DRN architecture
* 0.61: ECAL `phase2_ecal_devel` era, on CPU
* 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.75: Phase-2 HLT
* 0.91: Track DNN modifier
* 0.97: Premixing stage1
Expand Down
42 changes: 42 additions & 0 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1794,6 +1794,48 @@ def condition(self, fragment, stepList, key, hasHarvest):
offset = 0.612,
)

# ECAL component
class UpgradeWorkflow_ECalComponent(UpgradeWorkflow):
def __init__(self, suffix, offset, ecalMod,
steps = [
'GenSim',
'GenSimHLBeamSpot',
'GenSimHLBeamSpot14',
'GenSimHLBeamSpotHGCALCloseBy',
'Digi',
'DigiTrigger',
],
PU = [
'GenSim',
'GenSimHLBeamSpot',
'GenSimHLBeamSpot14',
'GenSimHLBeamSpotHGCALCloseBy',
'Digi',
'DigiTrigger',
]):
super(UpgradeWorkflow_ECalComponent, self).__init__(steps, PU, suffix, offset)
self.__ecalMod = ecalMod

def setup_(self, step, stepName, stepDict, k, properties):
if 'Sim' in step or 'Digi' in step:
if self.__ecalMod is not None:
stepDict[stepName][k] = merge([{'--procModifiers':self.__ecalMod},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,
ecalMod = 'ecal_component',
)

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

class UpgradeWorkflow_0T(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
myGT=stepDict[step][k]['--conditions']
Expand Down
7 changes: 5 additions & 2 deletions SimCalorimetry/EcalSimProducers/python/componentDigiParameters_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
componentTimeTag = cms.string("Component"),
componentSeparateDigi = cms.bool(False),
componentAddToBarrel = cms.bool(False),
componentTimePhase = cms.double(0.),

componentTimePhase = cms.double(0.)
)

from Configuration.ProcessModifiers.ecal_component_cff import ecal_component
from Configuration.ProcessModifiers.ecal_component_finely_sampled_waveforms_cff import ecal_component_finely_sampled_waveforms
(ecal_component | ecal_component_finely_sampled_waveforms).toModify(component_digi_parameters,componentSeparateDigi=True)
5 changes: 4 additions & 1 deletion SimCalorimetry/EcalSimProducers/python/ecalTimeDigiParameters_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@
timeLayerBarrel = cms.int32(7),
timeLayerEndcap = cms.int32(3),
componentWaveform = cms.bool(False)
)
)

from Configuration.ProcessModifiers.ecal_component_finely_sampled_waveforms_cff import ecal_component_finely_sampled_waveforms
(ecal_component_finely_sampled_waveforms).toModify(ecal_time_digi_parameters,componentWaveform=True)
7 changes: 7 additions & 0 deletions SimG4Core/Application/python/g4SimHits_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,13 @@
TimeSliceUnit = 0.001 )
)

##
## For ECAL component study
##
from Configuration.ProcessModifiers.ecal_component_cff import ecal_component
from Configuration.ProcessModifiers.ecal_component_finely_sampled_waveforms_cff import ecal_component_finely_sampled_waveforms
(ecal_component | ecal_component_finely_sampled_waveforms).toModify(g4SimHits,ECalSD = dict(StoreLayerTimeSim = True, SlopeLightYield = 0.0))

##
## Change CALO Thresholds
##
Expand Down