From c1076e713f3a1289f74a28118b19055c97aed1ce Mon Sep 17 00:00:00 2001 From: tomeichlersmith Date: Thu, 10 Nov 2022 09:11:27 -0600 Subject: [PATCH] revert to previous low-noise settings switching the technical implementaiton and the physical constants is too much all at once, so I'm keeping the technical implementation but moving the physical constant for the noise back to its 0.02PE value --- python/digi.py | 3 ++- python/hcal_hardcoded_conditions.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/python/digi.py b/python/digi.py index ed23fa1..46a1d7b 100644 --- a/python/digi.py +++ b/python/digi.py @@ -91,7 +91,8 @@ def __init__(self, instance_name = 'hcalDigis') : self.avgReadoutThreshold = 4. #ADCs - noise config only self.avgGain = 1.2 #noise config only self.avgPedestal = 1. #noise config only - self.avgNoiseRMS = 2. #noise config only + # avg noise set to 0.02PE + self.avgNoiseRMS = self.hgcroc.calculateVoltageHcal(0.02)/self.avgGain # input and output collection name parameters self.inputCollName = 'HcalSimHits' diff --git a/python/hcal_hardcoded_conditions.py b/python/hcal_hardcoded_conditions.py index 1277c5b..34e77f7 100644 --- a/python/hcal_hardcoded_conditions.py +++ b/python/hcal_hardcoded_conditions.py @@ -53,7 +53,7 @@ HcalHgcrocConditionsHardcode.validForAllRows([ 1. , #PEDESTAL - 2.0, #NOISE + 0.02*5/1.2, #NOISE - 0.02 PE with 1 PE ~ 5mV and gain = 1.2 12.5, #MEAS_TIME - ns - clock_cycle/2 - defines the point in the BX where an in-time (time=0 in times vector) hit would arrive 20., #PAD_CAPACITANCE - pF 200., #TOT_MAX - ns - maximum time chip would be in TOT mode