diff --git a/python/digi.py b/python/digi.py index 06080b7..68a3793 100644 --- a/python/digi.py +++ b/python/digi.py @@ -87,7 +87,8 @@ def __init__(self, instance_name = 'ecalDigis', si_thickness = 0.3) : avgGain = 0.3125/20. self.avgReadoutThreshold = 53.*avgGain self.avgPedestal = 50.*avgGain - self.avgNoiseRMS = 2.0*avgGain + # noise is too optimistic, but need to mimic old noise model + self.avgNoiseRMS = 0.6*avgGain # Should we suppress noise "hits" below readout threshold? self.zero_suppression = True @@ -147,7 +148,7 @@ def __init__(self, instance_name = 'ecalRecon') : # use helper functions to set these self.secondOrderEnergyCorrection = 1. self.layerWeights = [ ] - self.v12() + self.v14() def v2(self) : """These layerWeights and energy correction were calculated at least before v3 geometry. @@ -203,8 +204,8 @@ def v14(self) : self.secondOrderEnergyCorrection = 1.; self.layerWeights = [ - 2.008, 4.008, 6.218, 7.186, 8.291, 9.948, 10.611, 10.611, 10.611, 10.611, 10.611, - 10.611, 10.611, 10.611, 10.611, 10.611, 10.611, 10.611, 10.611, 10.611, 10.611, - 10.611, 10.611, 14.479, 18.235, 18.235, 18.235, 18.235, 18.235, 18.235, 18.235, - 18.235, 18.235, 9.633 + 2.312, 4.312, 6.522, 7.490, 8.595, 10.253, 10.915, 10.915, 10.915, 10.915, 10.915, + 10.915, 10.915, 10.915, 10.915, 10.915, 10.915, 10.915, 10.915, 10.915, 10.915, + 10.915, 10.915, 14.783, 18.539, 18.539, 18.539, 18.539, 18.539, 18.539, 18.539, + 18.539, 18.539, 9.938 ] diff --git a/python/ecal_hardcoded_conditions.py b/python/ecal_hardcoded_conditions.py index ad2307f..2319a67 100644 --- a/python/ecal_hardcoded_conditions.py +++ b/python/ecal_hardcoded_conditions.py @@ -42,8 +42,8 @@ ]) EcalHgcrocConditionsHardcode.validForAllRows([ - 50. , #PEDESTAL - 2.0, #NOISE + 50. , #PEDESTAL - ADC + 0.6, #NOISE - ADC, almost certainly too optimistic, but want to mimic previous noise model 0.0, #MEAS_TIME - ns 20., #PAD_CAPACITANCE - pF 200., #TOT_MAX - ns - maximum time chip would be in TOT mode