Merge pull request #21156 from kpedro88/FixHGCalAging

Fix HGCal aging
cms-sw · Nov 4, 2017 · 9b8d11d · 9b8d11d
2 parents 8c6eae3 + cbcb1c8
commit 9b8d11d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/SLHCUpgradeSimulations/Configuration/python/aging.py b/SLHCUpgradeSimulations/Configuration/python/aging.py
@@ -61,9 +61,9 @@ def ageHF(process,turnon):
 
 def agedHGCal(process):
     from SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi import HGCal_setEndOfLifeNoise
-    HGCal_setEndOfLifeNoise(getHGCalDigitizer(process,'EE'))
-    HGCal_setEndOfLifeNoise(getHGCalDigitizer(process,'FH'))
-    HGCal_setEndOfLifeNoise(getHGCalDigitizer(process,'BH'))
+    for subdet in ['EE','FH','BH']:
+        hgcaldigi = getHGCalDigitizer(process,subdet)
+        if hgcaldigi is not None: HGCal_setEndOfLifeNoise(hgcaldigi)
     return process
 
 # needs lumi to set proper ZS thresholds (tbd)

diff --git a/SimCalorimetry/HGCalSimProducers/python/hgcalDigitizer_cfi.py b/SimCalorimetry/HGCalSimProducers/python/hgcalDigitizer_cfi.py
@@ -169,6 +169,6 @@
 def HGCal_setEndOfLifeNoise(digitizer):
     if( digitizer.digiCollection != "HGCDigisHEback" ):
         digitizer.digiCfg.noise_fC = cms.vdouble( [x*fC_per_ele for x in endOfLifeNoises] )
-        digitizer.digiCfg.chargeCollectionEfficiency = cms.double(endOfLifeCCEs)
+        digitizer.digiCfg.chargeCollectionEfficiency = cms.vdouble(endOfLifeCCEs)
     else: #use S/N of 7 for SiPM readout
-        digitizer.digiCfg.noise_MIP = cms.vdouble( 1.0/5.0 )
+        digitizer.digiCfg.noise_MIP = cms.double( 1.0/5.0 )