Merge pull request #17037 from mariadalfonso/fixADCnoiseM2

HBHE: use proper quantization noise in the M2
cms-sw · Dec 23, 2016 · f0e524d · f0e524d
2 parents 4a08746 + 0035245
commit f0e524d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/RecoLocalCalo/HcalRecAlgos/src/PulseShapeFitOOTPileupCorrection.cc b/RecoLocalCalo/HcalRecAlgos/src/PulseShapeFitOOTPileupCorrection.cc
@@ -547,8 +547,11 @@ void PulseShapeFitOOTPileupCorrection::phase1Apply(const HBHEChannelInfo& channe
     energyArr[ip] = energy; pedenArr[ip] = peden;
 
     // quantization noise from the ADC (QIE8 or QIE10/11)
-    if(!channelData.hasTimeInfo()) noiseADCArr[ip] = psfPtr_->sigmaHPDQIE8(chargeArr[ip]);
-    if(channelData.hasTimeInfo()) noiseADCArr[ip] = psfPtr_->sigmaSiPMQIE10(chargeArr[ip]);
+    if(channelData.hasTimeInfo()) {
+      noiseADCArr[ip] = (1./sqrt(12))*channelData.tsDFcPerADC(ip);
+    } else {
+      noiseADCArr[ip] = psfPtr_->sigmaHPDQIE8(chargeArr[ip]); // Add Greg's channel discretization
+    }
 
     // dark current noise relevant for siPM
     noiseDCArr[ip] = 0;