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

adding a specified HFNose_noise_fC parameter set to avoid overwriting… #33861

Merged
merged 1 commit into from May 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 15 additions & 2 deletions SimCalorimetry/HGCalSimProducers/python/hgcalDigitizer_cfi.py
Expand Up @@ -54,6 +54,8 @@
values = cms.vdouble( [x*fC_per_ele for x in nonAgedNoises] ), #100,200,300 um
)

HFNose_noise_fC = HGCAL_noise_fC.clone()

HGCAL_noise_heback = cms.PSet(
scaleByDose = cms.bool(False),
scaleByDoseAlgo = cms.uint32(0),
Expand Down Expand Up @@ -196,7 +198,7 @@
ileakParam = cms.PSet(refToPSet_ = cms.string("HGCAL_ileakParam_toUse")),
cceParams = cms.PSet(refToPSet_ = cms.string("HGCAL_cceParams_toUse")),
chargeCollectionEfficiencies = cms.PSet(refToPSet_ = cms.string("HGCAL_chargeCollectionEfficiencies")),
noise_fC = cms.PSet(refToPSet_ = cms.string("HGCAL_noise_fC")),
noise_fC = cms.PSet(refToPSet_ = cms.string("HFNose_noise_fC")),
doTimeSamples = cms.bool(False),
thresholdFollowsMIP = cms.bool(thresholdTracksMIP),
feCfg = hgcROCSettings.clone()
Expand Down Expand Up @@ -299,6 +301,17 @@ def HGCal_setRealisticNoiseSi(process,byDose=True,byDoseAlgo=0,byDoseMap=doseMap
)
return process

def HFNose_setRealisticNoiseSi(process,byDose=True,byDoseAlgo=0,byDoseMap=doseMap,byDoseFactor=1):
process.HFNose_noise_fC = cms.PSet(
scaleByDose = cms.bool(byDose),
scaleByDoseAlgo = cms.uint32(byDoseAlgo),
scaleByDoseFactor = cms.double(byDoseFactor),
doseMap = byDoseMap,
values = cms.vdouble( [x*fC_per_ele for x in endOfLifeNoises] ), #100,200,300 um
)
return process


def HGCal_setRealisticNoiseSci(process,byDose=True,byDoseAlgo=0,byDoseMap=doseMap,byDoseFactor=1):
process.HGCAL_noise_heback = cms.PSet(
scaleByDose = cms.bool(byDose),
Expand Down Expand Up @@ -337,7 +350,7 @@ def HGCal_disableNoise(process):
def HFNose_setEndOfLifeNoise(process,byDose=True,byDoseAlgo=0,byDoseFactor=1):
"""includes all effects from radiation and gain choice"""
# byDoseAlgo is used as a collection of bits to toggle: FLUENCE, CCE, NOISE, PULSEPERGAIN, CACHEDOP (from lsb to Msb)
process=HGCal_setRealisticNoiseSi(process,byDose=byDose,byDoseAlgo=byDoseAlgo,byDoseMap=doseMapNose,byDoseFactor=byDoseFactor)
process=HFNose_setRealisticNoiseSi(process,byDose=byDose,byDoseAlgo=byDoseAlgo,byDoseMap=doseMapNose,byDoseFactor=byDoseFactor)
return process

doseMapNose = cms.string("SimCalorimetry/HGCalSimProducers/data/doseParams_3000fb_fluka_HFNose_3.7.20.12_Eta2.4.txt")
2 changes: 1 addition & 1 deletion SimGeneral/MixingModule/python/digitizers_cfi.py
Expand Up @@ -51,7 +51,7 @@
)


from SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi import hgceeDigitizer, hgchebackDigitizer, hgchefrontDigitizer, HGCAL_noise_fC, HGCAL_noise_heback, HGCAL_chargeCollectionEfficiencies, HGCAL_ileakParam_toUse, HGCAL_cceParams_toUse, HGCAL_noises
from SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi import hgceeDigitizer, hgchebackDigitizer, hgchefrontDigitizer, HGCAL_noise_fC, HGCAL_noise_heback, HFNose_noise_fC, HGCAL_chargeCollectionEfficiencies, HGCAL_ileakParam_toUse, HGCAL_cceParams_toUse, HGCAL_noises

from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
phase2_hgcal.toModify( theDigitizers,
Expand Down