diff --git a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRRegionXMLHandler.cxx b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRRegionXMLHandler.cxx index ed8e00d133a13c9232672ab005470b68b2119611..420cd588d42a94816ab12b5c440e174092f9e8ba 100644 --- a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRRegionXMLHandler.cxx +++ b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRRegionXMLHandler.cxx @@ -27,6 +27,7 @@ #include <iostream> #include <fstream> #include <string> +#include <stdexcept> TRRegionXMLHandler::TRRegionXMLHandler(TRTTransitionRadiation *tr) : m_theProcess(tr), @@ -46,14 +47,14 @@ void TRRegionXMLHandler::Process(const std::string& name) if( sc.isFailure() ) { if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << "Unable to locate StoreGate! Stopping!" << endmsg; - throw; + throw std::runtime_error("Unable to locate StoreGate!"); } StoreGateSvc* detStore = 0; sc = svcLocator->service( "DetectorStore", detStore); if( sc.isFailure() ) { if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << "Unable to locate DetectorStore! Leaving!" << endmsg; - throw; + throw std::runtime_error("Unable to locate DetectorStore!"); } const IdDictManager * idDictMgr = 0; @@ -67,14 +68,14 @@ void TRRegionXMLHandler::Process(const std::string& name) if (msgLevel(MSG::FATAL)) msg(MSG::FATAL) << "Could not retrieve geometry layout. TR process is not to be trusted in the following " << endmsg; - throw; + throw std::runtime_error("Could not retrieve geometry layout!"); } // Crack open the XML file std::filebuf fb; if (!fb.open(name,std::ios::in)){ msg(MSG::FATAL) << "Could not open file " << name << " bombing out" << endmsg; - throw; + throw std::runtime_error("Could not open file!"); } std::istream is(&fb); boost::property_tree::ptree pt; diff --git a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRTTransitionRadiation.cxx b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRTTransitionRadiation.cxx index 8b76c6e907fabb71812791d98c025de883919880..3de21237c7fab9b9333b1fdd7e844608598eb254 100644 --- a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRTTransitionRadiation.cxx +++ b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRTTransitionRadiation.cxx @@ -40,7 +40,7 @@ // // Constructor, destructor -TRTTransitionRadiation::TRTTransitionRadiation( const G4String& processName, const std::string xmlfilename) : +TRTTransitionRadiation::TRTTransitionRadiation( const G4String& processName, const std::string & xmlfilename) : G4VDiscreteProcess(processName,fElectromagnetic),m_XMLhandler(NULL),m_xmlfilename(xmlfilename), m_MinEnergyTR(0.0),m_MaxEnergyTR(0.0),m_NumBins(0),m_WplasmaGas(0.0), m_WplasmaFoil(0.0),m_GammaMin(0.0),m_EkinMin(0.0),m_Ey(NULL),m_Sr(NULL), diff --git a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRTTransitionRadiation.h b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRTTransitionRadiation.h index 96735c7c06565a852bc28f6c461f4cf57d160f41..1ae16c9983062e76a71a079b61106809e6aebbf8 100644 --- a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRTTransitionRadiation.h +++ b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRTTransitionRadiation.h @@ -18,7 +18,6 @@ #include "CxxUtils/checker_macros.h" #include <vector> -#include <iostream> //using namespace std; @@ -33,7 +32,7 @@ public: // Public Methods // ///////////////////////////////////////////////////////////////////////////// - TRTTransitionRadiation(const G4String& processName="TransitionRadiation", const std::string xmlfilename="TRgeomodelgeometry.xml"); + TRTTransitionRadiation(const G4String& processName="TransitionRadiation", const std::string & xmlfilename="TRgeomodelgeometry.xml"); virtual ~TRTTransitionRadiation(); void Initialize();