Merge pull request #14302 from ianna/calo-tests-fix

Use Correct HcalTopology Record
cms-sw · Apr 29, 2016 · 847e1f7 · 847e1f7
2 parents d702493 + 880bd39
commit 847e1f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Geometry/CaloEventSetup/test/CaloGeometryAnalyzer.cc b/Geometry/CaloEventSetup/test/CaloGeometryAnalyzer.cc
@@ -1149,7 +1149,7 @@ CaloGeometryAnalyzer::analyze( const edm::Event& /*iEvent*/, const edm::EventSet
    edm::ESHandle<CaloGeometry> pG;
    iSetup.get<CaloGeometryRecord>().get(pG);     
    edm::ESHandle<HcalTopology> pT;
-   iSetup.get<IdealGeometryRecord>().get(pT);     
+   iSetup.get<HcalRecNumberingRecord>().get(pT);
 
    const std::vector<DetId> allDetId ( pG->getValidDetIds() ) ;
 

diff --git a/Geometry/CaloEventSetup/test/runTestCaloGeometryDDD_cfg.py b/Geometry/CaloEventSetup/test/runTestCaloGeometryDDD_cfg.py
@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process("GeometryTest")
-process.load("Configuration.StandardSequences.MagneticField_38T_cff")
-process.load("Configuration.Geometry.GeometryExtended_cff")
+
+process.load('Configuration.Geometry.GeometryExtended_cff')
 process.load('Configuration.Geometry.GeometryExtendedReco_cff')
-process.load("FWCore.MessageLogger.MessageLogger_cfi")
+process.load('FWCore.MessageLogger.MessageLogger_cfi')
 
 process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(4) )