Merge pull request #14363 from bsunanda/Run2-hcx80

bsunanda:Run2-hcx80 Get rid of parameter set HcalRelabel
cms-sw · May 10, 2016 · e5c7fcd · e5c7fcd
2 parents cee6ecf + 03e2930
commit e5c7fcd
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 22 deletions.
diff --git a/Geometry/HcalEventSetup/python/HcalRelabel_cfi.py b/Geometry/HcalEventSetup/python/HcalRelabel_cfi.py
diff --git a/SLHCUpgradeSimulations/Configuration/python/HCalCustoms.py b/SLHCUpgradeSimulations/Configuration/python/HCalCustoms.py
@@ -4,7 +4,7 @@ def customise_HcalPhase0(process):
     process.load("CalibCalorimetry/HcalPlugins/Hcal_Conditions_forGlobalTag_cff")
 
     if hasattr(process,'mix') and hasattr(process.mix,'digitizers') and hasattr(process.mix.digitizers,'hcal'):
-        process.mix.digitizers.hcal.HcalReLabel.RelabelHits=cms.untracked.bool(True)
+        process.mix.digitizers.hcal.TestNumbering=True
 
     process.es_hardcode.HEreCalibCutoff = cms.double(20.) #for aging
 
@@ -126,7 +126,7 @@ def customise_Digi(process):
         process.mix.digitizers.hcal.he.photoelectronsToAnalog = cms.vdouble([10.]*16)
         process.mix.digitizers.hcal.he.pixels = cms.int32(4500*4*2)
         process.mix.digitizers.hcal.HFUpgradeQIE = True
-        process.mix.digitizers.hcal.HcalReLabel.RelabelHits=cms.untracked.bool(True)
+        process.mix.digitizers.hcal.TestNumbering = True
 
     if hasattr(process,'simHcalDigis'):
         process.simHcalDigis.useConfigZSvalues=cms.int32(1)

diff --git a/SLHCUpgradeSimulations/Geometry/python/Digi_Phase1_R30F12_HCal_cff.py b/SLHCUpgradeSimulations/Geometry/python/Digi_Phase1_R30F12_HCal_cff.py
@@ -66,7 +66,7 @@
 #HcalTopologyIdealEP.SLHCMode = cms.untracked.bool(True)
 
 #turn on hit relabeling and set depth segmentation
-HcalReLabel.RelabelHits = cms.untracked.bool(True)
+mix.digitizers.hcal.TestNumbering = cms.bool(True)
 
 #
 doAllDigi = cms.Sequence(trDigi+calDigi+muonDigi)

diff --git a/SLHCUpgradeSimulations/Geometry/python/Digi_Phase1_R34F16_HCal_cff.py b/SLHCUpgradeSimulations/Geometry/python/Digi_Phase1_R34F16_HCal_cff.py
@@ -66,7 +66,7 @@
 #HcalTopologyIdealEP.SLHCMode = cms.untracked.bool(True)
 
 #turn on hit relabeling and set depth segmentation
-HcalReLabel.RelabelHits = cms.untracked.bool(True)
+mix.digitizers.hcal.TestNumbering = cms.bool(True)
 
 #
 doAllDigi = cms.Sequence(trDigi+calDigi+muonDigi)

diff --git a/SimCalorimetry/HcalSimProducers/interface/HcalDigitizer.h b/SimCalorimetry/HcalSimProducers/interface/HcalDigitizer.h
@@ -148,7 +148,7 @@ class HcalDigitizer
   std::vector<DetId> theHFQIE8DetIds, theHFQIE10DetIds;
 
   bool isZDC,isHCAL,zdcgeo,hbhegeo,hogeo,hfgeo;
-  bool relabel_;
+  bool testNumbering_;
 
   std::string hitsProducer_;
 

diff --git a/SimCalorimetry/HcalSimProducers/python/hcalUnsuppressedDigis_cfi.py b/SimCalorimetry/HcalSimProducers/python/hcalUnsuppressedDigis_cfi.py
@@ -1,6 +1,5 @@
 import FWCore.ParameterSet.Config as cms
 from SimCalorimetry.HcalSimProducers.hcalSimParameters_cfi import *
-from Geometry.HcalEventSetup.HcalRelabel_cfi import HcalReLabel
 
 # make a block so other modules, such as the data mixing module, can
 # also run simulation
@@ -41,8 +40,8 @@
     injectTestHits = cms.bool(False),
     ChangeResponse = cms.bool(False),
     CorrFactorFile = cms.FileInPath("SimCalorimetry/HcalSimProducers/data/calor_corr01.txt"),
-    HcalReLabel = HcalReLabel,
     DelivLuminosity = cms.double(0),
+    TestNumbering = cms.bool(False),
     HEDarkening = cms.bool(False),
     HFDarkening = cms.bool(False),
     minFCToDelay=cms.double(5.) # old TC model! set to 5 for the new one

diff --git a/SimCalorimetry/HcalSimProducers/src/HcalDigitizer.cc b/SimCalorimetry/HcalSimProducers/src/HcalDigitizer.cc
@@ -287,10 +287,9 @@ HcalDigitizer::HcalDigitizer(const edm::ParameterSet& ps, edm::ConsumesCollector
   }
   theZDCDigitizer = new ZDCDigitizer(theZDCResponse, theZDCElectronicsSim, doEmpty);
 
-  edm::ParameterSet ps0 = ps.getParameter<edm::ParameterSet>("HcalReLabel");
-  relabel_ = ps0.getUntrackedParameter<bool>("RelabelHits");
-//  std::cout << "Flag to see if Hit Relabeller to be initiated " << relabel_ << std::endl;
-  if (relabel_) theRelabeller=new HcalHitRelabeller(ps0);
+  testNumbering_ = ps.getParameter<bool>("TestNumbering");
+//  std::cout << "Flag to see if Hit Relabeller to be initiated " << testNumbering_ << std::endl;
+  if (testNumbering_) theRelabeller=new HcalHitRelabeller(ps);
 
   bool doHPDNoise = ps.getParameter<bool>("doHPDNoise");
   if(doHPDNoise) {
@@ -458,11 +457,11 @@ void HcalDigitizer::accumulateCaloHits(edm::Handle<std::vector<PCaloHit> > const
     hcalHits.reserve(hcalHitsOrig.size());
 
     //evaluate darkening before relabeling
-    if(m_HEDarkening || m_HFRecalibration){
-      darkening(hcalHitsOrig);
-    }
-    // Relabel PCaloHits if necessary
-    if (relabel_) {
+    if (testNumbering_) {
+      if(m_HEDarkening || m_HFRecalibration){
+	darkening(hcalHitsOrig);
+      }
+      // Relabel PCaloHits if necessary
       edm::LogInfo("HcalDigitizer") << "Calling Relabeller";
       theRelabeller->process(hcalHitsOrig);
     }

diff --git a/SimGeneral/MixingModule/python/hcalDigitizer_cfi.py b/SimGeneral/MixingModule/python/hcalDigitizer_cfi.py
@@ -21,7 +21,7 @@
 eras.phase2_hgcal.toModify( hcalDigitizer,
     HBHEUpgradeQIE = cms.bool(True),
     HFUpgradeQIE = cms.bool(True),
-    HcalReLabel = dict( RelabelHits = cms.untracked.bool(True) ),
+    TestNumbering = cms.bool(True),
     hb = dict( siPMCells =cms.vint32([1]),
         photoelectronsToAnalog = cms.vdouble([10.]*16),
         pixels = cms.int32(4500*4*2)