HGCalSiNoiseMap: remove maxADC, legacy (unused) variable

cms-sw · Nov 12, 2019 · 3865030 · 3865030
1 parent 21f9737
commit 3865030
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/SimCalorimetry/HGCalSimAlgos/interface/HGCalSiNoiseMap.h b/SimCalorimetry/HGCalSimAlgos/interface/HGCalSiNoiseMap.h
@@ -18,7 +18,7 @@ class HGCalSiNoiseMap : public HGCalRadiationMap {
     SiCellOpCharacteristics()
         : lnfluence(0.), fluence(0.), ileak(0.), cce(1.), noise(0.), mipfC(0), gain(0), mipADC(0), thrADC(0) {}
     double lnfluence, fluence, ileak, cce, noise, mipfC;
-    unsigned int gain, mipADC, thrADC, maxADC;
+    unsigned int gain, mipADC, thrADC;
   };
 
   HGCalSiNoiseMap();

diff --git a/SimCalorimetry/HGCalSimAlgos/src/HGCalSiNoiseMap.cc b/SimCalorimetry/HGCalSimAlgos/src/HGCalSiNoiseMap.cc
@@ -2,11 +2,11 @@
 
 //
 HGCalSiNoiseMap::HGCalSiNoiseMap() : encpScale_(840.), encCommonNoiseSub_(sqrt(1.25)), qe2fc_(1.60217646E-4) {
-  encsParam_.push_back({636., 15.6, 0.0328});  //q80fC
-  maxADCPerGain_.push_back(80.);
-  encsParam_.push_back({1045., 8.74, 0.0685});  //q160fC
+  encsParam_.push_back({636., 15.6, 0.0328});   // q80fC
+  maxADCPerGain_.push_back(80.);                // the num of fC (charge) which corresponds to the max ADC value
+  encsParam_.push_back({1045., 8.74, 0.0685});  // q160fC
   maxADCPerGain_.push_back(160.);
-  encsParam_.push_back({1915., 2.79, 0.0878});  //q320fC
+  encsParam_.push_back({1915., 2.79, 0.0878});  // q320fC
   maxADCPerGain_.push_back(320.);
 
   for (auto i : maxADCPerGain_)
@@ -94,6 +94,7 @@ HGCalSiNoiseMap::SiCellOpCharacteristics HGCalSiNoiseMap::getSiCellOpCharacteris
       gain = HGCalSiNoiseMap::q160fC;
     if (gainIdx == 2)
       gain = HGCalSiNoiseMap::q320fC;
+    // move computation to ROC level (one day)
   }
 
   //fill in the parameters of the struct