Merge pull request #13822 from bsunanda/Run2-hcx76

bsunanda:Run2-hcx76 Remove obsolete parameter definitions for relabelling at DIGI step
cms-sw · Mar 30, 2016 · 3da0c18 · 3da0c18
2 parents f9005a1 + 7a535b7
commit 3da0c18
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 53 deletions.
diff --git a/Geometry/HcalEventSetup/python/CaloTowerGeometryDBReader_cfi.py b/Geometry/HcalEventSetup/python/CaloTowerGeometryDBReader_cfi.py
@@ -4,5 +4,3 @@
                                             applyAlignment = cms.bool(False)
                                             )
 
-import Geometry.HcalEventSetup.hcalTopologyConstants_cfi as hcalTopologyConstants_cfi
-CaloTowerGeometryFromDBEP.hcalTopologyConstants = cms.PSet(hcalTopologyConstants_cfi.hcalTopologyConstants)
diff --git a/Geometry/HcalEventSetup/python/HcalGeometryDBReader_cfi.py b/Geometry/HcalEventSetup/python/HcalGeometryDBReader_cfi.py
@@ -3,8 +3,6 @@
 HcalGeometryFromDBEP = cms.ESProducer("HcalGeometryFromDBEP",
                                       applyAlignment = cms.bool(False)
                                       )
-import Geometry.HcalEventSetup.hcalTopologyConstants_cfi as hcalTopologyConstants_cfi
-HcalGeometryFromDBEP.hcalTopologyConstants = cms.PSet(hcalTopologyConstants_cfi.hcalTopologyConstants)
 
 HcalAlignmentEP = cms.ESProducer("HcalAlignmentEP")
 
diff --git a/Geometry/HcalEventSetup/python/HcalGeometryDBWriter_cfi.py b/Geometry/HcalEventSetup/python/HcalGeometryDBWriter_cfi.py
@@ -1,15 +1,12 @@
 import FWCore.ParameterSet.Config as cms
-from Geometry.HcalEventSetup.HcalRelabel_cfi import HcalReLabel
 
 HcalHardcodeGeometryEP = cms.ESProducer( "HcalHardcodeGeometryEP" ,
                                          appendToDataLabel = cms.string("_master"),
-                                         UseOldLoader = cms.bool(False),
-                                         HcalReLabel = HcalReLabel
+                                         UseOldLoader = cms.bool(False)
                                          )
 
 HcalGeometryToDBEP = cms.ESProducer( "HcalGeometryToDBEP" ,
                                      applyAlignment = cms.bool(False) ,
-                                     appendToDataLabel = cms.string("_toDB"),
-                                     HcalReLabel = HcalReLabel
+                                     appendToDataLabel = cms.string("_toDB")
                                      )
 
diff --git a/Geometry/HcalEventSetup/python/HcalGeometry_cfi.py b/Geometry/HcalEventSetup/python/HcalGeometry_cfi.py
@@ -1,7 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-from Geometry.HcalEventSetup.HcalRelabel_cfi import HcalReLabel
 
 HcalHardcodeGeometryEP = cms.ESProducer("HcalHardcodeGeometryEP" ,
-                                        UseOldLoader = cms.bool(False),
-                                        HcalReLabel = HcalReLabel
-)
+                                        UseOldLoader = cms.bool(False)
+                                        )
diff --git a/Geometry/HcalEventSetup/python/HcalHardcodeGeometry_cfi.py b/Geometry/HcalEventSetup/python/HcalHardcodeGeometry_cfi.py
@@ -1,10 +1,8 @@
 import FWCore.ParameterSet.Config as cms
-from Geometry.HcalEventSetup.HcalRelabel_cfi import HcalReLabel
 
 HcalHardcodeGeometryEP = cms.ESProducer("HcalHardcodeGeometryEP" ,
                                         appendToDataLabel = cms.string("_master"),
-                                        UseOldLoader = cms.bool(False),
-                                        HcalReLabel = HcalReLabel
+                                        UseOldLoader = cms.bool(False)
                                         )
 
 HcalGeometryFromDBEP = cms.ESProducer("HcalGeometryFromDBEP",

diff --git a/Geometry/HcalEventSetup/python/HcalRelabel_cfi.py b/Geometry/HcalEventSetup/python/HcalRelabel_cfi.py
@@ -2,10 +2,4 @@
 
 HcalReLabel = cms.PSet( 
     RelabelHits  = cms.untracked.bool(False),
-    RelabelRules = cms.untracked.PSet(
-    CorrectPhi = cms.untracked.bool(False),
-    Eta1  = cms.untracked.vint32(1,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3),
-    Eta16 = cms.untracked.vint32(1,1,2,2,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3),
-    Eta17 = cms.untracked.vint32(1,1,2,2,3,3,3,4,4,4,4,4,5,5,5,5,5,5,5)
-    )
 )
diff --git a/Geometry/HcalEventSetup/python/HcalTrigTowerGeometry_cfi.py b/Geometry/HcalEventSetup/python/HcalTrigTowerGeometry_cfi.py
@@ -3,6 +3,3 @@
 import Geometry.HcalEventSetup.hcalTrigTowerGeometry_cfi
 
 hcalTrigTowerGeometry = Geometry.HcalEventSetup.hcalTrigTowerGeometry_cfi.hcalTrigTowerGeometry.clone()
-
-import Geometry.HcalEventSetup.hcalTopologyConstants_cfi as hcalTopologyConstants_cfi
-hcalTrigTowerGeometry.hcalTopologyConstants = cms.PSet(hcalTopologyConstants_cfi.hcalTopologyConstants)
diff --git a/Geometry/HcalTowerAlgo/test/runCaloTowerGeometryAnalyzer_cfg.py b/Geometry/HcalTowerAlgo/test/runCaloTowerGeometryAnalyzer_cfg.py
@@ -1,5 +1,4 @@
 import FWCore.ParameterSet.Config as cms
-from Geometry.HcalEventSetup.HcalRelabel_cfi import HcalReLabel
 
 process = cms.Process("CaloTowerGeometryTest")
 

diff --git a/Geometry/HcalTowerAlgo/test/runHcalGeometryAnalyzer_cfg.py b/Geometry/HcalTowerAlgo/test/runHcalGeometryAnalyzer_cfg.py
@@ -1,5 +1,4 @@
 import FWCore.ParameterSet.Config as cms
-from Geometry.HcalEventSetup.HcalRelabel_cfi import HcalReLabel
 
 process = cms.Process("HcalGeometryTest")
 

diff --git a/Geometry/HcalTowerAlgo/test/runHcalTransGeometryAnalyzer_cfg.py b/Geometry/HcalTowerAlgo/test/runHcalTransGeometryAnalyzer_cfg.py
@@ -1,23 +1,23 @@
 import FWCore.ParameterSet.Config as cms
-from Geometry.HcalEventSetup.HcalRelabel_cfi import HcalReLabel
 
 process = cms.Process("HcalGeometryTest")
 
-process.load("Configuration.Geometry.GeometryExtendedPostLS2_cff")
+process.load("Configuration.Geometry.GeometryExtended2023_cff")
+process.load("Geometry.HcalCommonData.hcalDDConstants_cff")
 process.load("Geometry.HcalEventSetup.hcalTopologyIdeal_cfi")
 
-process.HcalHardcodeGeometryEP = cms.ESProducer( "HcalHardcodeGeometryEP" ,
-                                                 appendToDataLabel = cms.string("_master"),
-                                                 HcalReLabel = HcalReLabel
-                                                 )
+process.HcalHardcodeGeometryEP = cms.ESProducer("HcalHardcodeGeometryEP" ,
+                                                UseOldLoader   = cms.bool(False),
+                                                appendToDataLabel = cms.string("_master")
+                                                )
 process.source = cms.Source("EmptySource")
 process.maxEvents = cms.untracked.PSet(
     input = cms.untracked.int32(1)
     )
 
 process.hga = cms.EDAnalyzer("HcalGeometryAnalyzer",
-                             HcalReLabel = HcalReLabel,
-                             HCALGeometryLabel = cms.string("_master"))
+                             UseOldLoader   = cms.bool(False),
+                             GeometryFromDB = cms.bool(False))
 
 process.Timing = cms.Service("Timing")
 process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck")

diff --git a/SLHCUpgradeSimulations/Configuration/python/customise_phase1_hcal.py b/SLHCUpgradeSimulations/Configuration/python/customise_phase1_hcal.py
@@ -253,9 +253,6 @@ def customise_wo_pairs(process):
     return (process)
 
 def turnOffLegacyPhiCorrection(process):
-    process.simHcalUnsuppressedDigis.HcalReLabel.RelabelRules.CorrectPhi = cms.untracked.bool(False)
-    process.HcalHardcodeGeometryEP.HcalReLabel.RelabelRules.CorrectPhi = cms.untracked.bool(False)
-    process.HcalReLabel.RelabelRules.CorrectPhi = cms.untracked.bool(False)
     return (process)
 
 def customise_pu15_25ns_wo_pairs(process):

diff --git a/SLHCUpgradeSimulations/Geometry/python/Digi_Phase1_R30F12_HCal_cff.py b/SLHCUpgradeSimulations/Geometry/python/Digi_Phase1_R30F12_HCal_cff.py
@@ -67,12 +67,6 @@
 
 #turn on hit relabeling and set depth segmentation
 HcalReLabel.RelabelHits = cms.untracked.bool(True)
-HcalReLabel.RelabelRules = cms.untracked.PSet(
-    CorrectPhi = cms.untracked.bool(True),
-    Eta1  = cms.untracked.vint32(1,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,5,5),
-    Eta16 = cms.untracked.vint32(1,1,1,2,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3),
-    Eta17 = cms.untracked.vint32(1,1,2,2,3,3,3,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5)
-    )
 
 #
 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
@@ -67,12 +67,6 @@
 
 #turn on hit relabeling and set depth segmentation
 HcalReLabel.RelabelHits = cms.untracked.bool(True)
-HcalReLabel.RelabelRules = cms.untracked.PSet(
-    CorrectPhi = cms.untracked.bool(True),
-    Eta1  = cms.untracked.vint32(1,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,5,5),
-    Eta16 = cms.untracked.vint32(1,1,1,2,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3),
-    Eta17 = cms.untracked.vint32(1,1,2,2,3,3,3,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5)
-    )
 
 #
 doAllDigi = cms.Sequence(trDigi+calDigi+muonDigi)

diff --git a/SimCalorimetry/HcalSimProducers/src/HcalDigitizer.cc b/SimCalorimetry/HcalSimProducers/src/HcalDigitizer.cc
@@ -288,9 +288,7 @@ HcalDigitizer::HcalDigitizer(const edm::ParameterSet& ps, edm::ConsumesCollector
   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.getUntrackedParameter<edm::ParameterSet>("RelabelRules"));
-  }     
+  if (relabel_) theRelabeller=new HcalHitRelabeller(ps0);
 
   bool doHPDNoise = ps.getParameter<bool>("doHPDNoise");
   if(doHPDNoise) {