diff --git a/SimG4CMS/Calo/plugins/HFPMTHitAnalyzer.cc b/SimG4CMS/Calo/plugins/HFPMTHitAnalyzer.cc index 6651959849d85..0a73d425c7bc5 100644 --- a/SimG4CMS/Calo/plugins/HFPMTHitAnalyzer.cc +++ b/SimG4CMS/Calo/plugins/HFPMTHitAnalyzer.cc @@ -203,7 +203,7 @@ void HFPMTHitAnalyzer::beginJob() { void HFPMTHitAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) { ++event_no; if (event_no % 500 == 0) - std::cout << "Event # " << event_no << " processed.\n"; + edm::LogVerbatim("HcalSim") << "Event # " << event_no << " processed."; std::vector caloHits; edm::Handle hitsHcal; diff --git a/SimG4CMS/Calo/plugins/HOSimHitStudy.cc b/SimG4CMS/Calo/plugins/HOSimHitStudy.cc index 10c6b7f378de5..7a3af2fdd1cb2 100644 --- a/SimG4CMS/Calo/plugins/HOSimHitStudy.cc +++ b/SimG4CMS/Calo/plugins/HOSimHitStudy.cc @@ -22,8 +22,8 @@ #include "SimG4CMS/Calo/interface/CaloHitID.h" #include "SimG4CMS/Calo/interface/HcalTestNumberingScheme.h" -#include "CLHEP/Units/GlobalPhysicalConstants.h" -#include "CLHEP/Units/GlobalSystemOfUnits.h" +#include +#include #include #include diff --git a/SimG4CMS/Calo/plugins/HcalTestAnalysis.cc b/SimG4CMS/Calo/plugins/HcalTestAnalysis.cc index d7ecc5bdc379d..6437d5b46555a 100644 --- a/SimG4CMS/Calo/plugins/HcalTestAnalysis.cc +++ b/SimG4CMS/Calo/plugins/HcalTestAnalysis.cc @@ -30,9 +30,10 @@ #include "G4Track.hh" #include "G4VProcess.hh" #include "G4HCofThisEvent.hh" -#include "CLHEP/Units/GlobalSystemOfUnits.h" -#include "CLHEP/Units/GlobalPhysicalConstants.h" -#include "Randomize.hh" + +#include +#include +#include #include #include diff --git a/SimG4CMS/Forward/plugins/BscTest.cc b/SimG4CMS/Forward/plugins/BscTest.cc index 707ea001b5b49..7ccd6513b02de 100644 --- a/SimG4CMS/Forward/plugins/BscTest.cc +++ b/SimG4CMS/Forward/plugins/BscTest.cc @@ -45,11 +45,11 @@ #include "G4ProcessManager.hh" #include "G4VTouchable.hh" -#include "CLHEP/Vector/ThreeVector.h" -#include "CLHEP/Vector/LorentzVector.h" -#include "CLHEP/Random/Randomize.h" -#include "CLHEP/Units/GlobalSystemOfUnits.h" -#include "CLHEP/Units/GlobalPhysicalConstants.h" +#include +#include +#include +#include +#include // ---------------------------------------------------------------- // Includes needed for Root ntupling diff --git a/SimG4CMS/Forward/plugins/CastorTestAnalysis.cc b/SimG4CMS/Forward/plugins/CastorTestAnalysis.cc index cf16c88ef553c..afd3f04834f6a 100644 --- a/SimG4CMS/Forward/plugins/CastorTestAnalysis.cc +++ b/SimG4CMS/Forward/plugins/CastorTestAnalysis.cc @@ -34,9 +34,10 @@ #include "G4VProcess.hh" #include "G4HCofThisEvent.hh" #include "G4UserEventAction.hh" -#include "CLHEP/Units/GlobalSystemOfUnits.h" -#include "CLHEP/Units/GlobalPhysicalConstants.h" -#include "CLHEP/Random/Randomize.h" + +#include +#include +#include #include "TROOT.h" #include "TFile.h" diff --git a/SimG4CMS/Forward/plugins/DoCastorAnalysis.cc b/SimG4CMS/Forward/plugins/DoCastorAnalysis.cc index 02c57004de2f9..9fe0a203e54b3 100644 --- a/SimG4CMS/Forward/plugins/DoCastorAnalysis.cc +++ b/SimG4CMS/Forward/plugins/DoCastorAnalysis.cc @@ -35,9 +35,10 @@ #include "G4VProcess.hh" #include "G4HCofThisEvent.hh" #include "G4UserEventAction.hh" -#include "CLHEP/Units/GlobalSystemOfUnits.h" -#include "CLHEP/Units/GlobalPhysicalConstants.h" -#include "CLHEP/Random/Randomize.h" + +#include +#include +#include #include "TROOT.h" #include "TFile.h" diff --git a/SimG4CMS/Forward/plugins/SimG4FluxProducer.cc b/SimG4CMS/Forward/plugins/SimG4FluxProducer.cc index f739d669de456..98a1cf7cf7f11 100644 --- a/SimG4CMS/Forward/plugins/SimG4FluxProducer.cc +++ b/SimG4CMS/Forward/plugins/SimG4FluxProducer.cc @@ -17,8 +17,9 @@ #include "G4Track.hh" #include "G4TouchableHistory.hh" #include "G4TransportationManager.hh" -#include "CLHEP/Units/GlobalSystemOfUnits.h" -#include "CLHEP/Units/GlobalPhysicalConstants.h" + +#include +#include #include #include diff --git a/SimG4CMS/Forward/plugins/TotemTestGem.cc b/SimG4CMS/Forward/plugins/TotemTestGem.cc index 5f57f88c4a86a..7ff4d053e49e3 100644 --- a/SimG4CMS/Forward/plugins/TotemTestGem.cc +++ b/SimG4CMS/Forward/plugins/TotemTestGem.cc @@ -40,8 +40,8 @@ #include "G4Step.hh" #include "G4HCofThisEvent.hh" -#include "CLHEP/Units/GlobalSystemOfUnits.h" -#include "CLHEP/Units/GlobalPhysicalConstants.h" +#include +#include class TotemTestGem : public SimProducer, public Observer, public Observer { public: diff --git a/SimG4CMS/Forward/plugins/ZdcTestAnalysis.cc b/SimG4CMS/Forward/plugins/ZdcTestAnalysis.cc index a748b2ead0a66..c2754962c1e60 100644 --- a/SimG4CMS/Forward/plugins/ZdcTestAnalysis.cc +++ b/SimG4CMS/Forward/plugins/ZdcTestAnalysis.cc @@ -29,9 +29,9 @@ #include "G4HCofThisEvent.hh" #include "G4UserEventAction.hh" -#include "CLHEP/Units/GlobalSystemOfUnits.h" -#include "CLHEP/Units/GlobalPhysicalConstants.h" -#include "CLHEP/Random/Randomize.h" +#include +#include +#include #include "TROOT.h" #include "TH1.h" diff --git a/SimG4CMS/HGCalTestBeam/plugins/HGCalTimingAnalyzer.cc b/SimG4CMS/HGCalTestBeam/plugins/HGCalTimingAnalyzer.cc index 730c8a7991b9d..e5ad26df771a3 100644 --- a/SimG4CMS/HGCalTestBeam/plugins/HGCalTimingAnalyzer.cc +++ b/SimG4CMS/HGCalTestBeam/plugins/HGCalTimingAnalyzer.cc @@ -1,8 +1,7 @@ // system include files #include -#include +#include #include -#include #include #include @@ -17,6 +16,7 @@ #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ServiceRegistry/interface/Service.h" @@ -92,11 +92,12 @@ HGCalTimingAnalyzer::HGCalTimingAnalyzer(const edm::ParameterSet& iConfig) if (!groupHits_) timeUnit_ = 0.000001; #ifdef EDM_ML_DEBUG - std::cout << "HGCalTimingAnalyzer:: Group Hits " << groupHits_ << " in " << timeUnit_ << " IdBeam " << idBeams_.size() - << ":"; + std::ostringstream st1; + st1 << "HGCalTimingAnalyzer:: Group Hits " << groupHits_ << " in " << timeUnit_ << " IdBeam " << idBeams_.size() + << ":"; for (const auto& id : idBeams_) - std::cout << " " << id; - std::cout << std::endl; + st1 << " " << id; + edm::LogVerbatim("HGCSim") << st1.str(); #endif if (idBeams_.empty()) idBeams_.push_back(1001); @@ -104,19 +105,19 @@ HGCalTimingAnalyzer::HGCalTimingAnalyzer(const edm::ParameterSet& iConfig) edm::InputTag tmp0 = iConfig.getParameter("GeneratorSrc"); tok_hepMC_ = consumes(tmp0); #ifdef EDM_ML_DEBUG - std::cout << "HGCalTimingAnalyzer:: GeneratorSource = " << tmp0 << std::endl; + edm::LogVerbatim("HGCSim") << "HGCalTimingAnalyzer:: GeneratorSource = " << tmp0; #endif tok_simTk_ = consumes(edm::InputTag("g4SimHits")); tok_simVtx_ = consumes(edm::InputTag("g4SimHits")); std::string tmp1 = iConfig.getParameter("CaloHitSrcEE"); tok_hitsEE_ = consumes(edm::InputTag("g4SimHits", tmp1)); #ifdef EDM_ML_DEBUG - std::cout << "HGCalTimingAnalyzer:: Detector " << detectorEE_ << " with tags " << tmp1 << std::endl; + edm::LogVerbatim("HGCSim") << "HGCalTimingAnalyzer:: Detector " << detectorEE_ << " with tags " << tmp1; #endif tmp1 = iConfig.getParameter("CaloHitSrcBeam"); tok_hitsBeam_ = consumes(edm::InputTag("g4SimHits", tmp1)); #ifdef EDM_ML_DEBUG - std::cout << "HGCalTimingAnalyzer:: Detector " << detectorBeam_ << " with tags " << tmp1 << std::endl; + edm::LogVerbatim("HGCSim") << "HGCalTimingAnalyzer:: Detector " << detectorBeam_ << " with tags " << tmp1; #endif } @@ -158,8 +159,8 @@ void HGCalTimingAnalyzer::beginRun(const edm::Run&, const edm::EventSetup& iSetu hgcons_ = &iSetup.getData(tokDDD_); #ifdef EDM_ML_DEBUG - std::cout << "HGCalTimingAnalyzer::" << detectorEE_ << " defined with " << hgcons_->layers(false) << " layers" - << std::endl; + edm::LogVerbatim("HGCSim") << "HGCalTimingAnalyzer::" << detectorEE_ << " defined with " << hgcons_->layers(false) + << " layers"; #endif } @@ -175,8 +176,8 @@ void HGCalTimingAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetu unsigned int k(0); for (HepMC::GenEvent::particle_const_iterator p = myGenEvent->particles_begin(); p != myGenEvent->particles_end(); ++p, ++k) { - std::cout << "Particle[" << k << "] with p " << (*p)->momentum().rho() << " theta " << (*p)->momentum().theta() - << " phi " << (*p)->momentum().phi() << std::endl; + edm::LogVerbatim("HGCSim") << "Particle[" << k << "] with p " << (*p)->momentum().rho() << " theta " + << (*p)->momentum().theta() << " phi " << (*p)->momentum().phi(); } } #endif @@ -200,30 +201,30 @@ void HGCalTimingAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetu iEvent.getByToken(tok_hitsEE_, theCaloHitContainers); if (theCaloHitContainers.isValid()) { #ifdef EDM_ML_DEBUG - std::cout << "PcalohitContainer for " << detectorEE_ << " has " << theCaloHitContainers->size() << " hits" - << std::endl; + edm::LogVerbatim("HGCSim") << "PcalohitContainer for " << detectorEE_ << " has " << theCaloHitContainers->size() + << " hits"; #endif caloHits.clear(); caloHits.insert(caloHits.end(), theCaloHitContainers->begin(), theCaloHitContainers->end()); analyzeSimHits(0, caloHits); } else { #ifdef EDM_ML_DEBUG - std::cout << "PCaloHitContainer does not exist for " << detectorEE_ << " !!!" << std::endl; + edm::LogVerbatim("HGCSim") << "PCaloHitContainer does not exist for " << detectorEE_ << " !!!"; #endif } iEvent.getByToken(tok_hitsBeam_, theCaloHitContainers); if (theCaloHitContainers.isValid()) { #ifdef EDM_ML_DEBUG - std::cout << "PcalohitContainer for " << detectorBeam_ << " has " << theCaloHitContainers->size() << " hits" - << std::endl; + edm::LogVerbatim("HGCSim") << "PcalohitContainer for " << detectorBeam_ << " has " << theCaloHitContainers->size() + << " hits"; #endif caloHits.clear(); caloHits.insert(caloHits.end(), theCaloHitContainers->begin(), theCaloHitContainers->end()); analyzeSimHits(1, caloHits); } else { #ifdef EDM_ML_DEBUG - std::cout << "PCaloHitContainer does not exist for " << detectorBeam_ << " !!!" << std::endl; + edm::LogVerbatim("HGCSim") << "PCaloHitContainer does not exist for " << detectorBeam_ << " !!!"; #endif } if (doTree_) @@ -246,16 +247,16 @@ void HGCalTimingAnalyzer::analyzeSimHits(int type, std::vector const& id = HGCalDetId((ForwardSubdetector)(subdet), zside, recoLayerCell.second, subsector, sector, recoLayerCell.first) .rawId(); #ifdef EDM_ML_DEBUG - std::cout << "SimHit:Hit[" << i << "] Id " << subdet << ":" << zside << ":" << layer << ":" << sector << ":" - << subsector << ":" << recoLayerCell.first << ":" << recoLayerCell.second << " Energy " << energy - << " Time " << time << std::endl; + edm::LogVerbatim("HGCSim") << "SimHit:Hit[" << i << "] Id " << subdet << ":" << zside << ":" << layer << ":" + << sector << ":" << subsector << ":" << recoLayerCell.first << ":" + << recoLayerCell.second << " Energy " << energy << " Time " << time; #endif } else { #ifdef EDM_ML_DEBUG int subdet, layer, x, y; HcalTestBeamNumbering::unpackIndex(id, subdet, layer, x, y); - std::cout << "SimHit:Hit[" << i << "] Beam Subdet " << subdet << " Layer " << layer << " x|y " << x << ":" << y - << " Energy " << energy << " Time " << time << std::endl; + edm::LogVerbatim("HGCSim") << "SimHit:Hit[" << i << "] Beam Subdet " << subdet << " Layer " << layer << " x|y " + << x << ":" << y << " Energy " << energy << " Time " << time; #endif } uint64_t tid = (uint64_t)((time + 50.0) / timeUnit_); @@ -273,8 +274,8 @@ void HGCalTimingAnalyzer::analyzeSimHits(int type, std::vector const& } #ifdef EDM_ML_DEBUG - std::cout << "analyzeSimHits: Finds " << map_hits.size() << " hits " - << " from the Hit Vector of size " << hits.size() << " for type " << type << std::endl; + edm::LogVerbatim("HGCSim") << "analyzeSimHits: Finds " << map_hits.size() << " hits " + << " from the Hit Vector of size " << hits.size() << " for type " << type; #endif for (const auto& itr : map_hits) { uint32_t id = (itr.first).first; @@ -290,7 +291,7 @@ void HGCalTimingAnalyzer::analyzeSimHits(int type, std::vector const& simHitCellTmBeam_.push_back(time); } #ifdef EDM_ML_DEBUG - std::cout << "SimHit::ID: " << std::hex << id << std::dec << " T: " << time << " E: " << energy << std::endl; + edm::LogVerbatim("HGCSim") << "SimHit::ID: " << std::hex << id << std::dec << " T: " << time << " E: " << energy; #endif } } @@ -301,9 +302,9 @@ void HGCalTimingAnalyzer::analyzeSimTracks(edm::Handle c int vertIndex(-1); for (edm::SimTrackContainer::const_iterator simTrkItr = SimTk->begin(); simTrkItr != SimTk->end(); simTrkItr++) { #ifdef EDM_ML_DEBUG - std::cout << "Track " << simTrkItr->trackId() << " Vertex " << simTrkItr->vertIndex() << " Type " - << simTrkItr->type() << " Charge " << simTrkItr->charge() << " momentum " << simTrkItr->momentum() << " " - << simTrkItr->momentum().P() << std::endl; + edm::LogVerbatim("HGCSim") << "Track " << simTrkItr->trackId() << " Vertex " << simTrkItr->vertIndex() << " Type " + << simTrkItr->type() << " Charge " << simTrkItr->charge() << " momentum " + << simTrkItr->momentum() << " " << simTrkItr->momentum().P(); #endif if (vertIndex == -1) { vertIndex = simTrkItr->vertIndex(); @@ -315,7 +316,7 @@ void HGCalTimingAnalyzer::analyzeSimTracks(edm::Handle c for (int iv = 0; iv < vertIndex; iv++) simVtxItr++; #ifdef EDM_ML_DEBUG - std::cout << "Vertex " << vertIndex << " position " << simVtxItr->position() << std::endl; + edm::LogVerbatim("HGCSim") << "Vertex " << vertIndex << " position " << simVtxItr->position(); #endif xBeam_ = simVtxItr->position().X(); yBeam_ = simVtxItr->position().Y(); diff --git a/SimG4CMS/HcalTestBeam/plugins/HcalTB02Analysis.cc b/SimG4CMS/HcalTestBeam/plugins/HcalTB02Analysis.cc index f94261404a9e2..14b0af992b18e 100644 --- a/SimG4CMS/HcalTestBeam/plugins/HcalTB02Analysis.cc +++ b/SimG4CMS/HcalTestBeam/plugins/HcalTB02Analysis.cc @@ -47,10 +47,10 @@ #include "G4ThreeVector.hh" #include "G4VProcess.hh" -#include "CLHEP/Random/RandGaussQ.h" -#include "CLHEP/Units/GlobalSystemOfUnits.h" -#include "CLHEP/Units/GlobalPhysicalConstants.h" -#include "Randomize.hh" +#include +#include +#include +#include //#define EDM_ML_DEBUG @@ -385,13 +385,13 @@ void HcalTB02Analysis::update(const EndOfEvent* evt) { int iEvt = (*evt)()->GetEventID(); if (iEvt < 10) - std::cout << " Event " << iEvt << std::endl; + edm::LogVerbatim("HcalTBSim") << " Event " << iEvt; else if ((iEvt < 100) && (iEvt % 10 == 0)) - std::cout << " Event " << iEvt << std::endl; + edm::LogVerbatim("HcalTBSim") << " Event " << iEvt; else if ((iEvt < 1000) && (iEvt % 100 == 0)) - std::cout << " Event " << iEvt << std::endl; + edm::LogVerbatim("HcalTBSim") << " Event " << iEvt; else if ((iEvt < 10000) && (iEvt % 1000 == 0)) - std::cout << " Event " << iEvt << std::endl; + edm::LogVerbatim("HcalTBSim") << " Event " << iEvt; } void HcalTB02Analysis::fillEvent(HcalTB02HistoClass& product) { diff --git a/SimG4CMS/HcalTestBeam/plugins/HcalTB04Analysis.cc b/SimG4CMS/HcalTestBeam/plugins/HcalTB04Analysis.cc index aed8798442175..fc11fb5b06916 100644 --- a/SimG4CMS/HcalTestBeam/plugins/HcalTB04Analysis.cc +++ b/SimG4CMS/HcalTestBeam/plugins/HcalTB04Analysis.cc @@ -56,10 +56,12 @@ #include "G4ThreeVector.hh" #include "G4VProcess.hh" #include "G4HCofThisEvent.hh" -#include "CLHEP/Random/RandGaussQ.h" -#include "CLHEP/Units/GlobalSystemOfUnits.h" -#include "CLHEP/Units/GlobalPhysicalConstants.h" -#include "Randomize.hh" + +#include +#include +#include +#include + #include //#define EDM_ML_DEBUG diff --git a/SimG4CMS/HcalTestBeam/plugins/HcalTB06Analysis.cc b/SimG4CMS/HcalTestBeam/plugins/HcalTB06Analysis.cc index 5690a501ecbf5..f6ce39dcf7eed 100644 --- a/SimG4CMS/HcalTestBeam/plugins/HcalTB06Analysis.cc +++ b/SimG4CMS/HcalTestBeam/plugins/HcalTB06Analysis.cc @@ -31,6 +31,7 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/Run.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "CommonTools/UtilAlgos/interface/TFileService.h" @@ -38,17 +39,15 @@ #include "SimDataFormats/HcalTestBeam/interface/HcalTestBeamNumbering.h" #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h" -#include "CLHEP/Units/GlobalSystemOfUnits.h" -#include "CLHEP/Units/GlobalPhysicalConstants.h" -#include "globals.hh" #include "Randomize.hh" +#include "globals.hh" + +#include +#include // system include files -#include -#include -#include -#include #include +#include //#define EDM_ML_DEBUG @@ -182,9 +181,9 @@ void HcalTB06Analysis::analyze(const edm::Event& evt, const edm::EventSetup&) { for (unsigned int i = 0; i < ne; ++i) { EBDetId ecalid((*EcalHits)[i].id()); #ifdef EDM_ML_DEBUG - std::cout << "EB " << i << " " << ecalid.ieta() << ":" << m_idxetaEcal << " " << ecalid.iphi() << ":" - << m_idxphiEcal << " " << (*EcalHits)[i].time() << ":" << m_timeLimit << " " - << (*EcalHits)[i].energy() << std::endl; + edm::LogVerbatim("HcalTBSim") << "EB " << i << " " << ecalid.ieta() << ":" << m_idxetaEcal << " " + << ecalid.iphi() << ":" << m_idxphiEcal << " " << (*EcalHits)[i].time() << ":" + << m_timeLimit << " " << (*EcalHits)[i].energy(); #endif // 7x7 crystal selection if (std::abs(m_idxetaEcal - ecalid.ieta()) <= 3 && std::abs(m_idxphiEcal - ecalid.iphi()) <= 3 && @@ -202,9 +201,9 @@ void HcalTB06Analysis::analyze(const edm::Event& evt, const edm::EventSetup&) { for (unsigned int i = 0; i < nh; ++i) { HcalDetId hcalid((*HcalHits)[i].id()); #ifdef EDM_ML_DEBUG - std::cout << "HC " << i << " " << hcalid.subdet() << " " << hcalid.ieta() << ":" << m_idxetaHcal << " " - << hcalid.iphi() << ":" << m_idxphiHcal << " " << (*HcalHits)[i].time() << ":" << m_timeLimit << " " - << (*HcalHits)[i].energy() << std::endl; + edm::LogVerbatim("HcalTBSim") << "HC " << i << " " << hcalid.subdet() << " " << hcalid.ieta() << ":" + << m_idxetaHcal << " " << hcalid.iphi() << ":" << m_idxphiHcal << " " + << (*HcalHits)[i].time() << ":" << m_timeLimit << " " << (*HcalHits)[i].energy(); #endif // 3x3 towers selection if (std::abs(m_idxetaHcal - hcalid.ieta()) <= 1 && std::abs(m_idxphiHcal - hcalid.iphi()) <= 1 && diff --git a/SimG4CMS/ShowerLibraryProducer/plugins/CastorShowerLibraryMaker.cc b/SimG4CMS/ShowerLibraryProducer/plugins/CastorShowerLibraryMaker.cc index 100a94aa362f8..488dd9acc2d07 100644 --- a/SimG4CMS/ShowerLibraryProducer/plugins/CastorShowerLibraryMaker.cc +++ b/SimG4CMS/ShowerLibraryProducer/plugins/CastorShowerLibraryMaker.cc @@ -50,11 +50,11 @@ #include "G4HCofThisEvent.hh" #include "G4UserEventAction.hh" -#include "CLHEP/Random/Randomize.h" -#include "CLHEP/Units/SystemOfUnits.h" -#include "CLHEP/Units/PhysicalConstants.h" -#include "CLHEP/Units/GlobalSystemOfUnits.h" -#include "CLHEP/Units/GlobalPhysicalConstants.h" +#include +#include +#include +#include +#include #include "TROOT.h" #include "TFile.h" diff --git a/SimG4CMS/ShowerLibraryProducer/plugins/HcalForwardAnalysis.cc b/SimG4CMS/ShowerLibraryProducer/plugins/HcalForwardAnalysis.cc index 065576cb74392..6af2fdac229ea 100644 --- a/SimG4CMS/ShowerLibraryProducer/plugins/HcalForwardAnalysis.cc +++ b/SimG4CMS/ShowerLibraryProducer/plugins/HcalForwardAnalysis.cc @@ -27,8 +27,9 @@ #include "G4Track.hh" #include "G4ThreeVector.hh" #include "G4VProcess.hh" -#include "CLHEP/Units/GlobalSystemOfUnits.h" -#include "CLHEP/Units/GlobalPhysicalConstants.h" + +#include +#include #include "TFile.h" #include "TTree.h"