diff --git a/SimG4Core/Geometry/src/DDG4ProductionCuts.cc b/SimG4Core/Geometry/src/DDG4ProductionCuts.cc index a82f010d635bb..bd5362d337ab9 100644 --- a/SimG4Core/Geometry/src/DDG4ProductionCuts.cc +++ b/SimG4Core/Geometry/src/DDG4ProductionCuts.cc @@ -103,11 +103,11 @@ void DDG4ProductionCuts::initialize() { edm::LogVerbatim("Geometry") << "DDG4ProductionCuts : new G4Region " << vv.first->GetName(); setProdCuts(vv.second, region); } - - region->AddRootLogicalVolume(vv.first); - - if (verbosity_ > 0) - edm::LogVerbatim("Geometry") << " added " << vv.first->GetName() << " to region " << region->GetName(); + if (nullptr != region) { + region->AddRootLogicalVolume(vv.first); + if (verbosity_ > 0) + edm::LogVerbatim("Geometry") << " added " << vv.first->GetName() << " to region " << region->GetName(); + } } } diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_EMM.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_EMM.cc index 1102e817810e8..37fb96268b98e 100644 --- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_EMM.cc +++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_EMM.cc @@ -18,9 +18,10 @@ FTFPCMS_INCLXX_EMM::FTFPCMS_INCLXX_EMM(const edm::ParameterSet& p) : PhysicsList bool hadPhys = p.getUntrackedParameter("HadPhysics", true); bool tracking = p.getParameter("TrackingCut"); double timeLimit = p.getParameter("MaxTrackTime") * CLHEP::ns; - edm::LogInfo("PhysicsList") << "You are using the simulation engine: " - << "FTFP_INCLXX_EMM \n Flags for EM Physics " << emPhys << ", for Hadronic Physics " - << hadPhys << " and tracking cut " << tracking << " t(ns)= " << timeLimit / CLHEP::ns; + edm::LogVerbatim("PhysicsList") << "You are using the simulation engine: " + << "FTFP_INCLXX_EMM \n Flags for EM Physics " << emPhys << ", for Hadronic Physics " + << hadPhys << " and tracking cut " << tracking + << " t(ns)= " << timeLimit / CLHEP::ns; if (emPhys) { // EM Physics @@ -41,7 +42,7 @@ FTFPCMS_INCLXX_EMM::FTFPCMS_INCLXX_EMM(const edm::ParameterSet& p) : PhysicsList RegisterPhysics(new G4HadronElasticPhysics(ver)); // Hadron Physics - RegisterPhysics(new G4HadronPhysicsINCLXX(ver, true, false, true)); + RegisterPhysics(new G4HadronPhysicsINCLXX("hInelastic INCLXX", true, false, true)); // Stopping Physics RegisterPhysics(new G4StoppingPhysics(ver)); diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_HP_EMM.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_HP_EMM.cc index ae8d7cb1435a3..a27ae3662ba54 100644 --- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_HP_EMM.cc +++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_HP_EMM.cc @@ -21,10 +21,10 @@ FTFPCMS_INCLXX_HP_EMM::FTFPCMS_INCLXX_HP_EMM(const edm::ParameterSet& p) : Physi bool tracking = p.getParameter("TrackingCut"); bool thermal = p.getUntrackedParameter("ThermalNeutrons"); double timeLimit = p.getParameter("MaxTrackTime") * CLHEP::ns; - edm::LogInfo("PhysicsList") << "You are using the simulation engine: " - << "FTFP_INCLXX_HP_EMM \n Flags for EM Physics " << emPhys << ", for Hadronic Physics " - << hadPhys << " and tracking cut " << tracking << " t(ns)= " << timeLimit / CLHEP::ns - << " ThermalNeutrons: " << thermal; + edm::LogVerbatim("PhysicsList") << "You are using the simulation engine: " + << "FTFP_INCLXX_HP_EMM \n Flags for EM Physics " << emPhys + << ", for Hadronic Physics " << hadPhys << " and tracking cut " << tracking + << " t(ns)= " << timeLimit / CLHEP::ns << " ThermalNeutrons: " << thermal; if (emPhys) { // EM Physics @@ -45,7 +45,7 @@ FTFPCMS_INCLXX_HP_EMM::FTFPCMS_INCLXX_HP_EMM(const edm::ParameterSet& p) : Physi RegisterPhysics(new G4HadronElasticPhysicsHP(ver)); // Hadron Physics - RegisterPhysics(new G4HadronPhysicsINCLXX(ver, true, true, true)); + RegisterPhysics(new G4HadronPhysicsINCLXX("hInelastic INCLXX_HP", true, true, true)); // Stopping Physics RegisterPhysics(new G4StoppingPhysics(ver)); diff --git a/SimG4Core/SaveSimTrackAction/src/SaveSimTrack.cc b/SimG4Core/SaveSimTrackAction/src/SaveSimTrack.cc index 4f121feadb5b7..8394fa163be8f 100644 --- a/SimG4Core/SaveSimTrackAction/src/SaveSimTrack.cc +++ b/SimG4Core/SaveSimTrackAction/src/SaveSimTrack.cc @@ -14,18 +14,18 @@ SaveSimTrack::SaveSimTrack(edm::ParameterSet const &p) { edm::ParameterSet ps = p.getParameter("SaveSimTrack"); pdgs_ = ps.getUntrackedParameter>("PDGCodes"); - edm::LogInfo("SaveSimTrack") << "SaveSimTrack:: Save Sim Track if PDG code " - << "is one from the list of " << pdgs_.size() << " items"; + edm::LogVerbatim("SaveSimTrack") << "SaveSimTrack:: Save Sim Track if PDG code " + << "is one from the list of " << pdgs_.size() << " items"; for (unsigned int k = 0; k < pdgs_.size(); ++k) - edm::LogInfo("SaveSimTrack") << "[" << k << "] " << pdgs_[k]; + edm::LogVerbatim("SaveSimTrack") << "[" << k << "] " << pdgs_[k]; } SaveSimTrack::~SaveSimTrack() {} void SaveSimTrack::update(const BeginOfTrack *trk) { - G4Track *theTrack = (G4Track *)((*trk)()); - TrackInformation *trkInfo = (TrackInformation *)(theTrack->GetUserInformation()); - if (trkInfo) { + const G4Track *theTrack = (*trk)(); + TrackInformation *trkInfo = reinterpret_cast(theTrack->GetUserInformation()); + if (nullptr != trkInfo) { int pdg = theTrack->GetDefinition()->GetPDGEncoding(); if (std::find(pdgs_.begin(), pdgs_.end(), pdg) != pdgs_.end()) { trkInfo->storeTrack(true);