From 5bc78c46fe4b1b52270599b5c43084f9b6eb16fe Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Tue, 10 Feb 2015 12:07:43 +0100 Subject: [PATCH] Update test --- Geometry/CMSCommonData/python/trackerSimGeometryXML_cfi.py | 1 + SimG4Core/PrintGeomInfo/src/PrintMaterialBudgetInfo.cc | 1 + .../PrintGeomInfo/test/python/run_MaterialBudgeInfo_cfg.py | 5 ++--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Geometry/CMSCommonData/python/trackerSimGeometryXML_cfi.py b/Geometry/CMSCommonData/python/trackerSimGeometryXML_cfi.py index ce8f7f71cb7ee..f5fadda426562 100644 --- 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 index 9bc87daa685ac..3e820969862b6 100644 --- 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 index f5f7cfb72c783..e51f7c366a135 100644 --- 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")