Merge pull request #5273 from igv4321/ts5-from-ts4

deriving ts5 correction from ts4
cms-sw · Sep 30, 2014 · ca8d7eb · ca8d7eb
2 parents e5e0ee0 + 22de58f
commit ca8d7eb
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/CondFormats/HcalObjects/interface/OOTPileupCorrDataFcn.h b/CondFormats/HcalObjects/interface/OOTPileupCorrDataFcn.h
@@ -31,10 +31,8 @@ class OOTPileupCorrDataFcn
         double ts321 = ts30 - ts22 > 0 ? a1_(ts30 - ts22) : 0; 
         ts[tsTrig] -= (ts321 + ts21); // ts[4] after pu correction
 
-        // ts5 correction with functions a2(x) and a3(x)
-        double ts52 = ts20 > 0 ? a3_(ts20) : 0;
-        double ts51 = ts30 - ts22 > 0 ? a2_(ts30 - ts22) : 0; 
-        ts[tsTrig+1] -= (ts51 + ts52); // ts[5] after pu correction 
+        // ts5 estimation from ts4
+        ts[tsTrig+1] = a1_(ts[tsTrig]);
     }
 
 private: