diff --git a/DDG4/src/Geant4Plugins.cpp b/DDG4/src/Geant4Plugins.cpp index 7d58fd1a1cc5bbfd484f0400cad3fe41d851fb97..9fb288a7bbaec5c0966c241fbc1934dd1cbfc353 100644 --- a/DDG4/src/Geant4Plugins.cpp +++ b/DDG4/src/Geant4Plugins.cpp @@ -30,6 +30,7 @@ #include "G4VPhysicsConstructor.hh" #include "G4ParticleDefinition.hh" #include "G4VUserPhysicsList.hh" +#include "G4VPrimaryGenerator.hh" DD4HEP_IMPLEMENT_PLUGIN_REGISTRY(G4VSensitiveDetector*, (std::string,DD4hep::Geometry::LCDD*)) DD4HEP_IMPLEMENT_PLUGIN_REGISTRY(DD4hep::Simulation::Geant4Sensitive*, (DD4hep::Simulation::Geant4Context*, diff --git a/DDG4/src/Geant4Random.cpp b/DDG4/src/Geant4Random.cpp index bdb7aee1142de78a532b208120f59fbf259d3951..ad663c8bfc3f5e4d22aa1f8fcdac26cd4be2a220 100644 --- a/DDG4/src/Geant4Random.cpp +++ b/DDG4/src/Geant4Random.cpp @@ -137,7 +137,7 @@ Geant4Random* Geant4Random::instance(bool throw_exception) { /// Initialize the instance. void Geant4Random::initialize() { if ( !m_file.empty() ) { - ifstream in(m_file); + ifstream in(m_file.c_str(), std::ios::in); m_engine = CLHEP::EngineFactory::newEngine(in); if ( !m_engine ) { except("Failed to create CLHEP random engine from file:%s.",m_file.c_str()); diff --git a/doc/CompileAllOptionPermutations.sh b/doc/CompileAllOptionPermutations.sh index d062e8d874bd70ab8906e0391d6c7c1c3b237ec7..cbfd717dd4199306c43dc4720e57412bc5acdf8f 100755 --- a/doc/CompileAllOptionPermutations.sh +++ b/doc/CompileAllOptionPermutations.sh @@ -5,8 +5,8 @@ INSTALL_G4=${SW}/g4_10.01.p02_dbg/lib/Geant4-10.1.2; INSTALL_LCIO=${SW}/lcio/v02-04-03; INSTALL_XERCESC=${SW}/xercesc; CHECKOUT=${dir_name}/../../DD4hep.trunk/checkout; -export ROOTSYS=${SW}/root_v5.34.25_dbg; export ROOTSYS=${SW}/root_v6.04.00_dbg; +export ROOTSYS=${SW}/root_v5.34.25_dbg; . ${ROOTSYS}/bin/thisroot.sh; #cat ${ROOTSYS}/bin/thisroot.sh; #