diff --git a/SLHCUpgradeSimulations/Geometry/src/PrintGeomMatInfo.cc b/SLHCUpgradeSimulations/Geometry/src/PrintGeomMatInfo.cc index 73dd03dd3fb17..ad949e5d84269 100644 --- a/SLHCUpgradeSimulations/Geometry/src/PrintGeomMatInfo.cc +++ b/SLHCUpgradeSimulations/Geometry/src/PrintGeomMatInfo.cc @@ -29,6 +29,8 @@ #include #include +using namespace CLHEP; + PrintGeomMatInfo::PrintGeomMatInfo(const edm::ParameterSet &p) { _dumpSummary = p.getUntrackedParameter("DumpSummary", true); @@ -470,7 +472,7 @@ void PrintGeomMatInfo::dumpTouch(G4VPhysicalVolume * pv, unsigned int leafDepth, out << leafDepth << spaces << "### VOLUME = " << lv->GetName() << " Copy No " << pv->GetCopyNo() << " in " << mother << " global position of centre " << globalpoint << " (r = " - << globalpoint.perp() << ", phi = " << globalpoint.phi()/deg + << globalpoint.perp() << ", phi = " << globalpoint.phi()/deg << ")" << std::endl; int NoDaughters = lv->GetNoDaughters(); diff --git a/SimG4Core/CustomPhysics/src/CustomParticleFactory.cc b/SimG4Core/CustomPhysics/src/CustomParticleFactory.cc index 7039daac0fd9d..0332d22097d10 100644 --- a/SimG4Core/CustomPhysics/src/CustomParticleFactory.cc +++ b/SimG4Core/CustomPhysics/src/CustomParticleFactory.cc @@ -19,6 +19,7 @@ #include #include "G4ProcessManager.hh" +using namespace CLHEP; bool CustomParticleFactory::loaded = false; std::set CustomParticleFactory::m_particles; diff --git a/SimG4Core/CustomPhysics/src/CustomPhysicsList.cc b/SimG4Core/CustomPhysics/src/CustomPhysicsList.cc index 4b094270e24de..79def38436af9 100644 --- a/SimG4Core/CustomPhysics/src/CustomPhysicsList.cc +++ b/SimG4Core/CustomPhysics/src/CustomPhysicsList.cc @@ -19,6 +19,8 @@ #include "SimG4Core/CustomPhysics/interface/FullModelHadronicProcess.hh" #include "SimG4Core/CustomPhysics/interface/ToyModelHadronicProcess.hh" + +using namespace CLHEP; CustomPhysicsList::CustomPhysicsList(std::string name, const edm::ParameterSet & p) : G4VPhysicsConstructor(name) { diff --git a/SimG4Core/CustomPhysics/src/DummyChargeFlipProcess.cc b/SimG4Core/CustomPhysics/src/DummyChargeFlipProcess.cc index 68eebe9227efc..3d60f8d1eb0f1 100644 --- a/SimG4Core/CustomPhysics/src/DummyChargeFlipProcess.cc +++ b/SimG4Core/CustomPhysics/src/DummyChargeFlipProcess.cc @@ -4,6 +4,8 @@ #include "SimG4Core/CustomPhysics/interface/DummyChargeFlipProcess.h" +using namespace CLHEP; + DummyChargeFlipProcess:: DummyChargeFlipProcess(const G4String& processName) : G4HadronicProcess(processName) diff --git a/SimG4Core/CustomPhysics/src/FullModelHadronicProcess.cc b/SimG4Core/CustomPhysics/src/FullModelHadronicProcess.cc index 4c3c35e0329a9..8a6e9fabe3d5e 100644 --- a/SimG4Core/CustomPhysics/src/FullModelHadronicProcess.cc +++ b/SimG4Core/CustomPhysics/src/FullModelHadronicProcess.cc @@ -9,6 +9,8 @@ #include "SimG4Core/CustomPhysics/interface/CustomPDGParser.h" #include "SimG4Core/CustomPhysics/interface/CustomParticle.h" +using namespace CLHEP; + FullModelHadronicProcess::FullModelHadronicProcess(G4ProcessHelper * aHelper, const G4String& processName) : G4VDiscreteProcess(processName), theHelper(aHelper) {} diff --git a/SimG4Core/CustomPhysics/src/FullModelReactionDynamics.cc b/SimG4Core/CustomPhysics/src/FullModelReactionDynamics.cc index 2b222829efdf9..18ec43f445717 100644 --- a/SimG4Core/CustomPhysics/src/FullModelReactionDynamics.cc +++ b/SimG4Core/CustomPhysics/src/FullModelReactionDynamics.cc @@ -57,6 +57,8 @@ #include #include "G4ParticleTable.hh" +using namespace CLHEP; + // #include "DumpFrame.hh" /* G4double GetQValue(G4ReactionProduct * aSec) diff --git a/SimG4Core/CustomPhysics/src/G4ProcessHelper.cc b/SimG4Core/CustomPhysics/src/G4ProcessHelper.cc index 3ca82f4d8ff28..cbf6f9cea76ad 100644 --- a/SimG4Core/CustomPhysics/src/G4ProcessHelper.cc +++ b/SimG4Core/CustomPhysics/src/G4ProcessHelper.cc @@ -13,6 +13,8 @@ #include "SimG4Core/CustomPhysics/interface/CustomPDGParser.h" #include "SimG4Core/CustomPhysics/interface/CustomParticle.h" +using namespace CLHEP; + G4ProcessHelper::G4ProcessHelper(const edm::ParameterSet & p){ particleTable = G4ParticleTable::GetParticleTable(); diff --git a/SimG4Core/CustomPhysics/src/HadronicProcessHelper.cc b/SimG4Core/CustomPhysics/src/HadronicProcessHelper.cc index 361d4099ffeca..6e07e67c64e5e 100644 --- a/SimG4Core/CustomPhysics/src/HadronicProcessHelper.cc +++ b/SimG4Core/CustomPhysics/src/HadronicProcessHelper.cc @@ -11,6 +11,8 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ParameterSet/interface/FileInPath.h" +using namespace CLHEP; + HadronicProcessHelper::HadronicProcessHelper(const std::string & fileName){ m_particleTable = G4ParticleTable::GetParticleTable(); diff --git a/SimG4Core/CustomPhysics/src/ToyModelHadronicProcess.cc b/SimG4Core/CustomPhysics/src/ToyModelHadronicProcess.cc index 28e075251b0b8..c4ac70123c101 100644 --- a/SimG4Core/CustomPhysics/src/ToyModelHadronicProcess.cc +++ b/SimG4Core/CustomPhysics/src/ToyModelHadronicProcess.cc @@ -11,6 +11,8 @@ #include "SimG4Core/CustomPhysics/interface/HadronicProcessHelper.hh" #include "SimG4Core/CustomPhysics/interface/Decay3Body.h" +using namespace CLHEP; + ToyModelHadronicProcess::ToyModelHadronicProcess(HadronicProcessHelper * aHelper, const G4String& processName) : G4VDiscreteProcess(processName), m_verboseLevel(0), m_helper(aHelper), m_detachCloud(true) { diff --git a/SimG4Core/GFlash/plugins/GflashG4Watcher.cc b/SimG4Core/GFlash/plugins/GflashG4Watcher.cc index c0206082cfbac..5737c410cc6e8 100644 --- a/SimG4Core/GFlash/plugins/GflashG4Watcher.cc +++ b/SimG4Core/GFlash/plugins/GflashG4Watcher.cc @@ -14,6 +14,8 @@ #include +using namespace CLHEP; + const double radLength = 8.9; // mm const double rMoliere = 21.9; // mm // constructors and destructor diff --git a/SimG4Core/GFlash/src/G4MiscLHEPBuilder_WP.cc b/SimG4Core/GFlash/src/G4MiscLHEPBuilder_WP.cc index 9f4a50527b928..09fac2c0d02e6 100644 --- a/SimG4Core/GFlash/src/G4MiscLHEPBuilder_WP.cc +++ b/SimG4Core/GFlash/src/G4MiscLHEPBuilder_WP.cc @@ -46,6 +46,8 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" +using namespace CLHEP; + G4MiscLHEPBuilder_WP::G4MiscLHEPBuilder_WP(): wasActivated(false) { theWrappedAntiProtonInelastic=new GflashHadronWrapperProcess("G4AntiProtonInelasticProcess"); diff --git a/SimG4Core/GFlash/src/GflashEMShowerModel.cc b/SimG4Core/GFlash/src/GflashEMShowerModel.cc index 11677bdfe9e29..e9251d7163f42 100644 --- a/SimG4Core/GFlash/src/GflashEMShowerModel.cc +++ b/SimG4Core/GFlash/src/GflashEMShowerModel.cc @@ -19,6 +19,8 @@ #include "G4TouchableHandle.hh" #include "G4VSensitiveDetector.hh" +using namespace CLHEP; + GflashEMShowerModel::GflashEMShowerModel(const G4String& modelName, G4Envelope* envelope, const edm::ParameterSet& parSet) diff --git a/SimG4Core/GFlash/src/GflashHadronShowerModel.cc b/SimG4Core/GFlash/src/GflashHadronShowerModel.cc index 110f68561a40f..aa77b743d873c 100644 --- a/SimG4Core/GFlash/src/GflashHadronShowerModel.cc +++ b/SimG4Core/GFlash/src/GflashHadronShowerModel.cc @@ -30,6 +30,8 @@ #include +using namespace CLHEP; + GflashHadronShowerModel::GflashHadronShowerModel(G4String modelName, G4Region* envelope, const edm::ParameterSet& parSet) : G4VFastSimulationModel(modelName, envelope), theParSet(parSet) { diff --git a/SimG4Core/GFlash/src/GflashHadronWrapperProcess.cc b/SimG4Core/GFlash/src/GflashHadronWrapperProcess.cc index 71e593d7abc76..4c452f9b6f1ae 100644 --- a/SimG4Core/GFlash/src/GflashHadronWrapperProcess.cc +++ b/SimG4Core/GFlash/src/GflashHadronWrapperProcess.cc @@ -10,6 +10,8 @@ #include "G4VProcess.hh" #include "G4GPILSelection.hh" +using namespace CLHEP; + GflashHadronWrapperProcess::GflashHadronWrapperProcess(G4String processName) : particleChange(0), pmanager(0), diff --git a/SimG4Core/GFlash/src/ParametrisedPhysics.cc b/SimG4Core/GFlash/src/ParametrisedPhysics.cc index cfece7b9d6235..54370d2507a79 100644 --- a/SimG4Core/GFlash/src/ParametrisedPhysics.cc +++ b/SimG4Core/GFlash/src/ParametrisedPhysics.cc @@ -11,6 +11,8 @@ #include "G4IonConstructor.hh" #include "G4RegionStore.hh" +using namespace CLHEP; + ParametrisedPhysics::ParametrisedPhysics(std::string name, const edm::ParameterSet & p) : G4VPhysicsConstructor(name), theParSet(p) diff --git a/SimG4Core/KillSecondaries/src/KillSecondariesTrackAction.cc b/SimG4Core/KillSecondaries/src/KillSecondariesTrackAction.cc index de783f2e8ba51..256c78396c0ca 100644 --- a/SimG4Core/KillSecondaries/src/KillSecondariesTrackAction.cc +++ b/SimG4Core/KillSecondaries/src/KillSecondariesTrackAction.cc @@ -7,6 +7,8 @@ #include "G4Track.hh" +using namespace CLHEP; + KillSecondariesTrackAction::KillSecondariesTrackAction(edm::ParameterSet const & p) { killHeavy = p.getParameter("KillHeavy"); diff --git a/SimG4Core/PrintGeomInfo/src/PrintGeomInfoAction.cc b/SimG4Core/PrintGeomInfo/src/PrintGeomInfoAction.cc index 93c482a27b3df..e94af6ac41ad3 100644 --- a/SimG4Core/PrintGeomInfo/src/PrintGeomInfoAction.cc +++ b/SimG4Core/PrintGeomInfo/src/PrintGeomInfoAction.cc @@ -29,6 +29,8 @@ #include #include +using namespace CLHEP; + PrintGeomInfoAction::PrintGeomInfoAction(const edm::ParameterSet &p) { _dumpSummary = p.getUntrackedParameter("DumpSummary", true); diff --git a/SimG4Core/PrintGeomInfo/src/PrintSensitive.cc b/SimG4Core/PrintGeomInfo/src/PrintSensitive.cc index 3e85b0151e08e..b24381de10c3e 100644 --- a/SimG4Core/PrintGeomInfo/src/PrintSensitive.cc +++ b/SimG4Core/PrintGeomInfo/src/PrintSensitive.cc @@ -11,6 +11,8 @@ #include #include +using namespace CLHEP; + PrintSensitive::PrintSensitive(const edm::ParameterSet &p) { name = p.getUntrackedParameter("Name","*"); nchar = name.find("*"); diff --git a/SimG4Core/TrackingVerbose/src/TrackingVerboseAction.cc b/SimG4Core/TrackingVerbose/src/TrackingVerboseAction.cc index a568dd678bea6..26ab308cdee72 100644 --- a/SimG4Core/TrackingVerbose/src/TrackingVerboseAction.cc +++ b/SimG4Core/TrackingVerbose/src/TrackingVerboseAction.cc @@ -24,6 +24,8 @@ #include +using namespace CLHEP; + TrackingVerboseAction::TrackingVerboseAction(edm::ParameterSet const & p) : theTrackingManager(0), fVerbose(0) { diff --git a/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialProducer.cc b/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialProducer.cc index 85dd1b6c087a4..aa005e775fad5 100644 --- a/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialProducer.cc +++ b/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialProducer.cc @@ -28,6 +28,8 @@ #include "TrackingMaterialProducer.h" +using namespace CLHEP; + // missing from GEANT4 < 9.0 : G4LogicalVolumeStore::GetVolume( name ) static const G4LogicalVolume* GetVolume(const std::string& name) { diff --git a/Validation/Geometry/src/MaterialBudgetHcal.cc b/Validation/Geometry/src/MaterialBudgetHcal.cc index b67943f70ec1e..488bf6989c546 100644 --- a/Validation/Geometry/src/MaterialBudgetHcal.cc +++ b/Validation/Geometry/src/MaterialBudgetHcal.cc @@ -17,6 +17,8 @@ #include +using namespace CLHEP; + MaterialBudgetHcal::MaterialBudgetHcal(const edm::ParameterSet& p): theHistoHcal(0), theHistoCastor(0) {