From 1e8b9d62c426607d83151cace9eb12c97638c783 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Wed, 24 Jul 2019 17:46:37 +0200 Subject: [PATCH 1/3] Fix printout --- SimG4Core/Geometry/src/DDG4ProductionCuts.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SimG4Core/Geometry/src/DDG4ProductionCuts.cc b/SimG4Core/Geometry/src/DDG4ProductionCuts.cc index e18fec03f6dc5..43ea5d7285205 100644 --- a/SimG4Core/Geometry/src/DDG4ProductionCuts.cc +++ b/SimG4Core/Geometry/src/DDG4ProductionCuts.cc @@ -63,15 +63,15 @@ void DDG4ProductionCuts::initialize() { G4RegionStore* store = G4RegionStore::GetInstance(); for (auto const& vv : vec_) { unsigned int num = map_.toString(keywordRegion_, vv.second, regionName); - edm::LogVerbatim("Geometry") << " num " << num << " regionName: " << regionName << " " << store; + edm::LogVerbatim("Geometry") << " num " << num << " regionName: " << regionName << ", the store of size " << store->size(); if (num != 1) { throw cms::Exception("SimG4CorePhysics", " DDG4ProductionCuts::initialize: Problem with Region tags."); } if (regionName != curName) { - edm::LogVerbatim("Geometry") << "DDG4ProductionCuts : regionName " << regionName << " " << store; + edm::LogVerbatim("Geometry") << "DDG4ProductionCuts : regionName " << regionName << ", the store of size " << store->size(); region = store->FindOrCreateRegion(regionName); - edm::LogVerbatim("Geometry") << "DDG4ProductionCuts : region " << region; + edm::LogVerbatim("Geometry") << "DDG4ProductionCuts : region " << region->GetName(); if (!region) { throw cms::Exception("SimG4CoreGeometry", " DDG4ProductionCuts::initialize: Problem with Region tags."); } From 144a30343b6b05bfb635274eacda6a6632d8c3a0 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Wed, 24 Jul 2019 18:03:00 +0200 Subject: [PATCH 2/3] Code format patch --- SimG4Core/Geometry/src/DDG4ProductionCuts.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SimG4Core/Geometry/src/DDG4ProductionCuts.cc b/SimG4Core/Geometry/src/DDG4ProductionCuts.cc index 43ea5d7285205..c49c84a43e280 100644 --- a/SimG4Core/Geometry/src/DDG4ProductionCuts.cc +++ b/SimG4Core/Geometry/src/DDG4ProductionCuts.cc @@ -63,13 +63,15 @@ void DDG4ProductionCuts::initialize() { G4RegionStore* store = G4RegionStore::GetInstance(); for (auto const& vv : vec_) { unsigned int num = map_.toString(keywordRegion_, vv.second, regionName); - edm::LogVerbatim("Geometry") << " num " << num << " regionName: " << regionName << ", the store of size " << store->size(); + edm::LogVerbatim("Geometry") << " num " << num << " regionName: " << regionName << ", the store of size " + << store->size(); if (num != 1) { throw cms::Exception("SimG4CorePhysics", " DDG4ProductionCuts::initialize: Problem with Region tags."); } if (regionName != curName) { - edm::LogVerbatim("Geometry") << "DDG4ProductionCuts : regionName " << regionName << ", the store of size " << store->size(); + edm::LogVerbatim("Geometry") << "DDG4ProductionCuts : regionName " << regionName << ", the store of size " + << store->size(); region = store->FindOrCreateRegion(regionName); edm::LogVerbatim("Geometry") << "DDG4ProductionCuts : region " << region->GetName(); if (!region) { From f4d6955ae2de06a9ec4b98f1b0c755a602c58eea Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Thu, 25 Jul 2019 11:25:11 +0200 Subject: [PATCH 3/3] Update DDG4ProductionCuts.cc a fix after megre --- SimG4Core/Geometry/src/DDG4ProductionCuts.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SimG4Core/Geometry/src/DDG4ProductionCuts.cc b/SimG4Core/Geometry/src/DDG4ProductionCuts.cc index 2d45df6436beb..cc1dcb7dbf995 100644 --- a/SimG4Core/Geometry/src/DDG4ProductionCuts.cc +++ b/SimG4Core/Geometry/src/DDG4ProductionCuts.cc @@ -82,7 +82,7 @@ void DDG4ProductionCuts::initialize() { G4Region* region = nullptr; G4RegionStore* store = G4RegionStore::GetInstance(); for (auto const& vv : vec_) { - unsigned int num = map_.toString(keywordRegion_, vv.second, regionName); + unsigned int num = map_->toString(keywordRegion_, vv.second, regionName); edm::LogVerbatim("Geometry") << " num " << num << " regionName: " << regionName << ", the store of size " << store->size(); if (num != 1) {