Modification to move ZDC trigger spacing to TP channel parameters con…

…ditions.
cms-sw · Oct 29, 2024 · 476bdb1 · 476bdb1
1 parent 52219c0
commit 476bdb1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/CalibCalorimetry/HcalTPGAlgos/interface/HcaluLUTTPGCoder.h b/CalibCalorimetry/HcalTPGAlgos/interface/HcaluLUTTPGCoder.h
@@ -32,7 +32,6 @@ class HcalDbService;
 class HcaluLUTTPGCoder : public HcalTPGCoder {
 public:
   static const float lsb_;
-  static const float zdc_lsb_;
 
   HcaluLUTTPGCoder();
   HcaluLUTTPGCoder(const HcalTopology* topo, const HcalTimeSlew* delay);

diff --git a/CalibCalorimetry/HcalTPGAlgos/src/HcaluLUTTPGCoder.cc b/CalibCalorimetry/HcalTPGAlgos/src/HcaluLUTTPGCoder.cc
@@ -29,7 +29,6 @@
 #include "CalibCalorimetry/HcalTPGAlgos/interface/LutXml.h"
 
 const float HcaluLUTTPGCoder::lsb_ = 1. / 16;
-const float HcaluLUTTPGCoder::zdc_lsb_ = 50.;
 
 const int HcaluLUTTPGCoder::QIE8_LUT_BITMASK;
 const int HcaluLUTTPGCoder::QIE10_LUT_BITMASK;
@@ -596,6 +595,7 @@ void HcaluLUTTPGCoder::update(const HcalDbService& conditions) {
 
       auto tpParam = conditions.getHcalTPChannelParameter(cell, false);
       int weight = tpParam->getauxi1();
+      int factorGeVPerCount = tpParam->getauxi2();
 
       int lutId = getLUTId(cell);
       int lutId_ootpu = lutId + sizeZDC_;
@@ -656,9 +656,9 @@ void HcaluLUTTPGCoder::update(const HcalDbService& conditions) {
             lut[adc] = 0;
             lut_ootpu[adc] = 0;
           } else {
-            lut[adc] = std::min(std::max(0, int((adc2fC(adc) - ped) * gain * rcalib / zdc_lsb_)), MASK);
-            lut_ootpu[adc] =
-                std::min(std::max(0, int((adc2fC(adc) - ped) * gain * rcalib * weight / (zdc_lsb_ * 256))), MASK);
+            lut[adc] = std::min(std::max(0, int((adc2fC(adc) - ped) * gain * rcalib / factorGeVPerCount)), MASK);
+            lut_ootpu[adc] = std::min(
+                std::max(0, int((adc2fC(adc) - ped) * gain * rcalib * weight / (factorGeVPerCount * 256))), MASK);
           }
         }
       }