Merge pull request #22849 from christopheralanwest/hcal-tp-revert-sat…

…-changes-10_1_X Revert "Do not truncate QIE11 linearization LUTs at 10 bits"
cms-sw · Apr 15, 2018 · f85bc94 · f85bc94
2 parents 6c4101d + a09c77d
commit f85bc94
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/CalibCalorimetry/HcalTPGAlgos/interface/HcaluLUTTPGCoder.h b/CalibCalorimetry/HcalTPGAlgos/interface/HcaluLUTTPGCoder.h
@@ -64,9 +64,7 @@ class HcaluLUTTPGCoder : public HcalTPGCoder {
 
   static const int QIE8_LUT_BITMASK = 0x3FF;
   static const int QIE10_LUT_BITMASK = 0x7FF;
-  static const int QIE11_LUT_BITMASK = 0x7FF;
-  // only the lowest 10 bits were used in 2017
-  static const int QIE11_LUT_BITMASK_2017 = 0x3FF;
+  static const int QIE11_LUT_BITMASK = 0x3FF;
 
 private:
   // typedef
@@ -79,8 +77,8 @@ class HcaluLUTTPGCoder : public HcalTPGCoder {
   static const int    nFi_ = 72;
 
   static const int QIE8_LUT_MSB = 0x400;
-  static const int QIE11_LUT_MSB0 = 0x800;
-  static const int QIE11_LUT_MSB1 = 0x1000;
+  static const int QIE11_LUT_MSB0 = 0x400;
+  static const int QIE11_LUT_MSB1 = 0x800;
   static const int QIE10_LUT_MSB  = 0x1000;
 
   // member variables

diff --git a/CalibCalorimetry/HcalTPGAlgos/src/HcaluLUTTPGCoder.cc b/CalibCalorimetry/HcalTPGAlgos/src/HcaluLUTTPGCoder.cc
@@ -35,7 +35,6 @@ const float HcaluLUTTPGCoder::lsb_=1./16;
 const int HcaluLUTTPGCoder::QIE8_LUT_BITMASK;
 const int HcaluLUTTPGCoder::QIE10_LUT_BITMASK;
 const int HcaluLUTTPGCoder::QIE11_LUT_BITMASK;
-const int HcaluLUTTPGCoder::QIE11_LUT_BITMASK_2017;
 
 constexpr double MaximumFractionalError = 0.002; // 0.2% error allowed from this source
 
@@ -348,8 +347,7 @@ void HcaluLUTTPGCoder::update(const HcalDbService& conditions) {
 
 	const size_t SIZE = qieType==QIE8 ? INPUT_LUT_SIZE : UPGRADE_LUT_SIZE;
 	const int MASK = qieType==QIE8 ? QIE8_LUT_BITMASK :
-                         qieType==QIE10 ? QIE10_LUT_BITMASK :
-                         is2018OrLater ? QIE11_LUT_BITMASK : QIE11_LUT_BITMASK_2017;
+                         qieType==QIE10 ? QIE10_LUT_BITMASK : QIE11_LUT_BITMASK;
         double linearLSB = linearLSB_QIE8_;
         if (qieType == QIE11 and cell.ietaAbs() == topo_->lastHBRing())
            linearLSB = linearLSB_QIE11Overlap_;