From 15585c28755dfafb5b2f31941999d7a5e55230e4 Mon Sep 17 00:00:00 2001 From: Salavat Date: Mon, 17 Apr 2017 19:11:49 +0200 Subject: [PATCH 1/2] HF 3TS in DIGI and L1 emulation configs for 2017 --- .../HcalSimProducers/python/hcalSimParameters_cfi.py | 12 ++++++++++++ .../HcalTrigPrimProducers/python/hcaltpdigi_cfi.py | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py b/SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py index 00ce3370edc85..897e7d65844a0 100644 --- 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 index b2c341a139f1d..ee53caca6eb14 100644 --- 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)) From 8d7e5c103d68658bdacac9da9b47b55ff1d39e3c Mon Sep 17 00:00:00 2001 From: Salavat Date: Wed, 19 Apr 2017 08:42:36 +0200 Subject: [PATCH 2/2] fix HF 2017 ZS to cope with 3TS Digi size --- .../python/hcalDigisRealistic_cfi.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SimCalorimetry/HcalZeroSuppressionProducers/python/hcalDigisRealistic_cfi.py b/SimCalorimetry/HcalZeroSuppressionProducers/python/hcalDigisRealistic_cfi.py index eb135f3e5af17..73451da645630 100644 --- 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) +)