Merge pull request #18372 from abdoulline/HF_2017_3TS

Bringing 2017 HF simulation in sync with the data configuration
cms-sw · Apr 20, 2017 · f945a7a · f945a7a
2 parents f1ae3b0 + 8d7e5c1
commit f945a7a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py b/SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py
@@ -120,6 +120,18 @@
     )
 )
 
+from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017
+run2_HF_2017.toModify( hcalSimParameters,
+    hf1 = dict(
+               readoutFrameSize = cms.int32(3), 
+               binOfMaximum     = cms.int32(2)
+              ),
+    hf2 = dict(
+               readoutFrameSize = cms.int32(3), 
+               binOfMaximum     = cms.int32(2)
+              )
+)
+
 from Configuration.Eras.Modifier_run3_HB_cff import run3_HB
 run3_HB.toModify( hcalSimParameters,
     hb = dict(

diff --git a/SimCalorimetry/HcalTrigPrimProducers/python/hcaltpdigi_cfi.py b/SimCalorimetry/HcalTrigPrimProducers/python/hcaltpdigi_cfi.py
@@ -55,5 +55,9 @@
 )
 
 run2_HE_2017.toModify(simHcalTriggerPrimitiveDigis, upgradeHE=cms.bool(True))
-run2_HF_2017.toModify(simHcalTriggerPrimitiveDigis, upgradeHF=cms.bool(True))
+run2_HF_2017.toModify(simHcalTriggerPrimitiveDigis, 
+                      upgradeHF=cms.bool(True),
+                      numberOfSamplesHF = cms.int32(2),
+                      numberOfPresamplesHF = cms.int32(1)
+)
 run3_HB.toModify(simHcalTriggerPrimitiveDigis, upgradeHB=cms.bool(True))
diff --git a/SimCalorimetry/HcalZeroSuppressionProducers/python/hcalDigisRealistic_cfi.py b/SimCalorimetry/HcalZeroSuppressionProducers/python/hcalDigisRealistic_cfi.py
@@ -26,3 +26,8 @@
                              useConfigZSvalues = cms.int32(1),
                              HElevel = cms.int32(3)
 )
+
+from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017
+run2_HF_2017.toModify( simHcalDigis,
+                             HFregion = cms.vint32(1,2)
+)