Merge pull request #6855 from violatingcp/hcal-fixchi2

fixed chi2 constraint on pedestal and time
cms-sw · Dec 10, 2014 · 1264b5e · 1264b5e
2 parents cebd233 + 83e5947
commit 1264b5e
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/RecoLocalCalo/HcalRecAlgos/src/PulseShapeFitOOTPileupCorrection.cc b/RecoLocalCalo/HcalRecAlgos/src/PulseShapeFitOOTPileupCorrection.cc
@@ -132,18 +132,18 @@ namespace FitterFuncs{
       for (i=0;i<nbins; ++i) {
         delta2 = (psFit_y[i]- pulse_shape_sum[i])*(psFit_y[i]- pulse_shape_sum[i])/psFit_erry2[i];
         chisq += delta2;
-        //Add the pedestal Constraint to chi2
-        if(pedestalConstraint_) {
-          chisq += invertpedSig2_*(pars.back() - pedMean_)*(pars.back()- pedMean_);
-        }
-        //Add the time Constraint to chi2
-        if(timeConstraint_) {
-          for(j=0; j< (pars.size()-1)/2; ++j ){
-             int time = (pars[j*2]+timeShift_)/(double)HcalConst::nsPerBX;
-             double time1 = -100.+time*HcalConst::nsPerBX;
-             chisq += inverttimeSig2_*(pars[j*2] - timeMean_ - time1)*(pars[j*2] - timeMean_ - time1);
-          }
-        }
+      }
+      //Add the pedestal Constraint to chi2
+      if(pedestalConstraint_) {
+	chisq += invertpedSig2_*(pars.back() - pedMean_)*(pars.back()- pedMean_);
+      }
+      //Add the time Constraint to chi2
+      if(timeConstraint_) {
+	for(j=0; j< (pars.size()-1)/2; ++j ){
+	  int time = (pars[j*2]+timeShift_)/(double)HcalConst::nsPerBX;
+	  double time1 = -100.+time*HcalConst::nsPerBX;
+	  chisq += inverttimeSig2_*(pars[j*2] - timeMean_ - time1)*(pars[j*2] - timeMean_ - time1);
+	}
       }
       return chisq;
    }