make more explicit when using 1TS vs 2TS containment

cms-sw · Oct 14, 2020 · 90fe405 · 90fe405
1 parent fe6f319
commit 90fe405
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/CalibCalorimetry/HcalTPGAlgos/src/HcaluLUTTPGCoder.cc b/CalibCalorimetry/HcalTPGAlgos/src/HcaluLUTTPGCoder.cc
@@ -442,20 +442,23 @@ void HcaluLUTTPGCoder::update(const HcalDbService& conditions) {
             double correctedCharge = containmentCorrection1TS * adc2fC(adc);
             double containmentCorrection2TSCorrected =
                 pulseCorr_->correction(cell, 2, correctionPhaseNS, correctedCharge);
-
-            containmentCorrection = containmentCorrection2TSCorrected;
             if (qieType == QIE11) {
               // When contain1TS_ is set, it should still only apply for QIE11-related things
               if ((contain1TSHB_ and cell.ietaAbs() <= topo_->lastHBRing()) or
-                  (contain1TSHE_ and cell.ietaAbs() > topo_->lastHBRing()))
+                  (contain1TSHE_ and cell.ietaAbs() > topo_->lastHBRing())) {
                 containmentCorrection = containmentCorrection1TS;
+              } else {
+                containmentCorrection = containmentCorrection2TSCorrected;
+              }
 
               const HcalSiPMParameter& siPMParameter(*conditions.getHcalSiPMParameter(cell));
               HcalSiPMnonlinearity corr(
                   conditions.getHcalSiPMCharacteristics()->getNonLinearities(siPMParameter.getType()));
               const double fcByPE = siPMParameter.getFCByPE();
               const double effectivePixelsFired = correctedCharge / fcByPE;
               nonlinearityCorrection = corr.getRecoCorrectionFactor(effectivePixelsFired);
+            } else {
+              containmentCorrection = containmentCorrection2TSCorrected;
             }
           }
           if (allLinear_)