fix typo and make the default MC time slew the old one in the method …

…3 pr 11101
cms-sw · Sep 16, 2015 · ce3de74 · ce3de74
1 parent 098c5ee
commit ce3de74
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
@@ -115,14 +115,6 @@ def customiseFor10927(process):
     return process
 
 
-
-# update Method3 with new time slew parametrization and response correction for data (PR #11091)
-def customizeFor11091(process):
-    # the parameters to be used for data are set in HcalHitReconstructor::fillDescriptions()
-    # the parameters to be used for MC are set in customizeHLTforMC.py 
-    return process
-
-
 # CMSSW version specific customizations
 def customiseHLTforCMSSW(process, menuType="GRun", fastSim=False):
     import os
@@ -136,7 +128,6 @@ def customiseHLTforCMSSW(process, menuType="GRun", fastSim=False):
         process = customiseFor7966(process)
         process = customiseFor7794(process)
         process = customizeHLTforNewJetCorrectors(process)
-        process = customizeFor11091(process)
     if cmsswVersion >= "CMSSW_7_4":
         process = customiseFor10234(process)
 

diff --git a/HLTrigger/Configuration/python/customizeHLTforMC.py b/HLTrigger/Configuration/python/customizeHLTforMC.py
@@ -23,8 +23,12 @@ def customizeHLTforMC(process,_fastSim=False):
     process.hltHbhereco.pedestalSubtractionType = cms.int32( 1 )
     process.hltHbhereco.pedestalUpperLimit      = cms.double( 2.7 ) 
     process.hltHbhereco.timeSlewParsType        = cms.int32( 3 )
-    process.hltHbhereco.timeSlewPars            = cms.vdouble( 12.2999, -2.19142, 0, 12.2999, -2.19142, 0, 12.2999, -2.19142, 0 )
-    process.hltHbhereco.respCorrM3              = cms.double( 0.95 )
+    #old MC
+    process.hltHbhereco.timeSlewPars            = cms.vdouble( 9.27638, -2.05585, 0, 9.27638, -2.05585, 0, 9.27638, -2.05585, 0 ) 
+    process.hltHbhereco.respCorrM3              = cms.double( 1.0 )
+    #new MC once completely implemented
+#    process.hltHbhereco.timeSlewPars            = cms.vdouble( 12.2999, -2.19142, 0, 12.2999, -2.19142, 0, 12.2999, -2.19142, 0 )
+#    process.hltHbhereco.respCorrM3              = cms.double( 0.95 )
 
 
   if _fastSim:

diff --git a/SLHCUpgradeSimulations/Configuration/python/postLS1Customs.py b/SLHCUpgradeSimulations/Configuration/python/postLS1Customs.py
@@ -160,20 +160,24 @@ def customise_Sim(process):
 def customise_New_HCAL(process):
     if hasattr(process,'mix') and hasattr(process.mix,'digitizers'):
         if hasattr(process.mix.digitizers,'hcal'):
-            process.mix.digitizer.hcal.minFCToDelay=5.
+            process.mix.digitizers.hcal.minFCToDelay=5.
         if hasattr(process.mix.digitizers,'hcal') and hasattr(process.mix.digitizers.hcal,'hf1'):
             process.mix.digitizers.hcal.hf1.samplingFactor = cms.double(0.67)
         if hasattr(process.mix.digitizers,'hcal') and hasattr(process.mix.digitizers.hcal,'hf2'):
             process.mix.digitizers.hcal.hf2.samplingFactor = cms.double(0.67)
 
     if hasattr(process,'mixData'):
         if hasattr(process.mix.digitizers,'hcal'):
-            process.mixData.digitizer.hcal.minFCToDelay=5.
+            process.mixData.digitizers.hcal.minFCToDelay=5.
         if hasattr(process.mixData,'hf1'):
             process.mixData.hf1.samplingFactor = cms.double(0.67)
         if hasattr(process.mixData,'hf2'):
             process.mixData.hf2.samplingFactor = cms.double(0.67)
 
+        if hasattr(process,'hltHbhereco'):
+            process.hltHbhereco.timeSlewPars = cms.vdouble( 12.2999, -2.19142, 0, 12.2999, -2.19142, 0, 12.2999, -2.19142, 0 )
+            process.hltHbhereco.respCorrM3   = cms.double( 0.95 )
+
     return process