From 888ba466b05bde1f247b7ea49a1d611b74b8810a Mon Sep 17 00:00:00 2001
From: Andrea Bocci <fwyzard@gmail.com>
Date: Thu, 9 Mar 2017 23:21:44 +0100
Subject: [PATCH] Set HCAL method 3 respons to 1.0 for data and MC.

Assume that retuning the pulse shapes will give the same response
for Method 2 and Method 3, both for data and MC.
---
 HLTrigger/Configuration/python/customizeHLTforHCALPhaseI.py   | 2 +-
 HLTrigger/Configuration/python/customizeHLTforMC.py           | 4 +++-
 .../HcalRecProducers/python/HBHEMethod3Parameters_cfi.py      | 2 +-
 RecoLocalCalo/HcalRecProducers/src/HcalHitReconstructor.cc    | 2 +-
 RecoLocalCalo/HcalRecProducers/src/HcalSimpleReconstructor.cc | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/HLTrigger/Configuration/python/customizeHLTforHCALPhaseI.py b/HLTrigger/Configuration/python/customizeHLTforHCALPhaseI.py
index 0e7cda1e70c4e..951ce9762112e 100644
--- a/HLTrigger/Configuration/python/customizeHLTforHCALPhaseI.py
+++ b/HLTrigger/Configuration/python/customizeHLTforHCALPhaseI.py
@@ -88,7 +88,7 @@ def customizeHLTforHEforPhaseI(process):
             timeSlewParsType    = cms.int32(3),                 # 0: TestStand, 1:Data, 2:MC, 3:InputPars. Parametrization function is par0 + par1*log(fC+par2).
             timeSlewPars        = cms.vdouble(12.2999, -2.19142, 0, 12.2999, -2.19142, 0, 12.2999, -2.19142, 0),
                                                                 # HB par0, HB par1, HB par2, BE par0, BE par1, BE par2, HE par0, HE par1, HE par2
-            respCorrM3          = cms.double(0.95)              # This factor is used to align the the Method3 with the Method2 response
+            respCorrM3          = cms.double(1.0)               # This factor is used to align the the Method3 with the Method2 response
         ),
 
         # Reconstruction algorithm configuration data to fetch from DB, if any
diff --git a/HLTrigger/Configuration/python/customizeHLTforMC.py b/HLTrigger/Configuration/python/customizeHLTforMC.py
index 357cba9088581..be2118dd89d90 100644
--- a/HLTrigger/Configuration/python/customizeHLTforMC.py
+++ b/HLTrigger/Configuration/python/customizeHLTforMC.py
@@ -28,6 +28,8 @@ def customizeHLTforMC(process):
   if 'hltHbhePhase1Reco' in process.__dict__:
     if process.hltHbhePhase1Reco._TypedParameterizable__type == 'HBHEPhase1Reconstructor':
       # 2017 "plan 1"
-      process.hltHbhePhase1Reco.algorithm.respCorrM3 = cms.double( 1.0 )
+      # assume retuning the pulse shapes will give the same response
+      # in data and MC for Method 2 and Method 3
+      pass
 
   return process
diff --git a/RecoLocalCalo/HcalRecProducers/python/HBHEMethod3Parameters_cfi.py b/RecoLocalCalo/HcalRecProducers/python/HBHEMethod3Parameters_cfi.py
index 5f62fd7ac24d9..8671ae6344067 100644
--- a/RecoLocalCalo/HcalRecProducers/python/HBHEMethod3Parameters_cfi.py
+++ b/RecoLocalCalo/HcalRecProducers/python/HBHEMethod3Parameters_cfi.py
@@ -6,5 +6,5 @@
     pedestalUpperLimit      = cms.double(2.7),
     timeSlewParsType        = cms.int32(3),     # 0: TestStand, 1:Data, 2:MC, 3:InputPars. Parametrization function is par0 + par1*log(fC+par2).
     timeSlewPars            = cms.vdouble(12.2999, -2.19142, 0, 12.2999, -2.19142, 0, 12.2999, -2.19142, 0), # HB par0, HB par1, HB par2, BE par0, BE par1, BE par2, HE par0, HE par1, HE par2
-    respCorrM3              = cms.double(0.95) # This factor is used to align the the Method3 with the Method2 response
+    respCorrM3              = cms.double(1.0)   # This factor is used to align the the Method3 with the Method2 response
 )
diff --git a/RecoLocalCalo/HcalRecProducers/src/HcalHitReconstructor.cc b/RecoLocalCalo/HcalRecProducers/src/HcalHitReconstructor.cc
index 39b39e344b4bd..85fd6f0850f5c 100644
--- a/RecoLocalCalo/HcalRecProducers/src/HcalHitReconstructor.cc
+++ b/RecoLocalCalo/HcalRecProducers/src/HcalHitReconstructor.cc
@@ -295,7 +295,7 @@ void HcalHitReconstructor::fillDescriptions(edm::ConfigurationDescriptions& desc
   desc.add<double>("pedestalUpperLimit", 2.7); 
   desc.add<int>("timeSlewParsType",3);
   desc.add<std::vector<double>>("timeSlewPars", { 12.2999, -2.19142, 0, 12.2999, -2.19142, 0, 12.2999, -2.19142, 0 });
-  desc.add<double>("respCorrM3", 0.95);
+  desc.add<double>("respCorrM3", 1.0);
   descriptions.add("hltHbhereco",desc);
 }
 
diff --git a/RecoLocalCalo/HcalRecProducers/src/HcalSimpleReconstructor.cc b/RecoLocalCalo/HcalRecProducers/src/HcalSimpleReconstructor.cc
index 2de3867937d8a..959f11821918d 100644
--- a/RecoLocalCalo/HcalRecProducers/src/HcalSimpleReconstructor.cc
+++ b/RecoLocalCalo/HcalRecProducers/src/HcalSimpleReconstructor.cc
@@ -66,7 +66,7 @@ void HcalSimpleReconstructor::fillDescriptions(edm::ConfigurationDescriptions& d
   desc.add<double>("pedestalUpperLimit", 2.7); 
   desc.add<int>("timeSlewParsType",3);
   desc.add<std::vector<double>>("timeSlewPars", { 12.2999, -2.19142, 0, 12.2999, -2.19142, 0, 12.2999, -2.19142, 0 });
-  desc.add<double>("respCorrM3", 0.95);
+  desc.add<double>("respCorrM3", 1.0);
   descriptions.add("simpleHbhereco",desc);
 }