Update test

hufnagel · Feb 10, 2015 · 5bc78c4 · 5bc78c4
1 parent 61d2244
commit 5bc78c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Geometry/CMSCommonData/python/trackerSimGeometryXML_cfi.py b/Geometry/CMSCommonData/python/trackerSimGeometryXML_cfi.py
@@ -13,6 +13,7 @@
         'Geometry/CMSCommonData/data/cmsBeam.xml', 
         'Geometry/CMSCommonData/data/mgnt.xml', 
         'Geometry/CMSCommonData/data/muonMagnet.xml', 
+        'Geometry/TrackerCommonData/data/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/pixfwdMaterials.xml', 
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml', 
         'Geometry/TrackerCommonData/data/pixfwdPlaq.xml', 

diff --git a/SimG4Core/PrintGeomInfo/src/PrintMaterialBudgetInfo.cc b/SimG4Core/PrintGeomInfo/src/PrintMaterialBudgetInfo.cc
@@ -57,6 +57,7 @@ void PrintMaterialBudgetInfo::update(const BeginOfRun* run) {
   G4Random::setTheEngine(new CLHEP::RanecuEngine);
   // Physical Volume
   theTopPV = G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume();
+  assert(theTopPV);
   // Logical Volume
   G4LogicalVolume*  lv = theTopPV->GetLogicalVolume();
   unsigned int leafDepth = 0;

diff --git a/SimG4Core/PrintGeomInfo/test/python/run_MaterialBudgeInfo_cfg.py b/SimG4Core/PrintGeomInfo/test/python/run_MaterialBudgeInfo_cfg.py
@@ -3,9 +3,8 @@
 process = cms.Process("PrintMaterialBudget")
 
 process.load('FWCore.MessageService.MessageLogger_cfi')
-process.load("Geometry.CMSCommonData.trackerSimGeometryXML_cfi")
-process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi")
-process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi")
+process.load('Geometry.CMSCommonData.cmsExtendedGeometry2015XML_cfi')
+process.load('Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi')
 
 process.MessageLogger.destinations = cms.untracked.vstring("MatBudget.txt")