Commit 7548eb9c authored by Håkan Wennlöf's avatar Håkan Wennlöf
Browse files

Merge branch 'f-g4exception' into 'master' 

GeometryBuilderG4: Register Exception Handler

See merge request allpix-squared/allpix-squared!1029
parents 501c35d8 c425493c

src/modules/GeometryBuilderGeant4/GeometryBuilderGeant4Module.cpp

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <utility>



#include <G4GlobalConfig.hh>

#include <G4StateManager.hh>

#include <G4UImanager.hh>

#include <G4UIterminal.hh>

#include <G4Version.hh>
@@ -35,6 +36,7 @@ 
#include "core/config/exceptions.h"

#include "core/geometry/GeometryManager.hpp"

#include "core/utils/log.h"

#include "tools/geant4/G4ExceptionHandler.hpp"

#include "tools/geant4/G4LoggingDestination.hpp"

#include "tools/geant4/MTRunManager.hpp"

#include "tools/geant4/RunManager.hpp"
@@ -45,6 +47,9 @@ using namespace ROOT; 
GeometryBuilderGeant4Module::GeometryBuilderGeant4Module(Configuration& config, Messenger*, GeometryManager* geo_manager)

    : Module(config), geo_manager_(geo_manager), run_manager_g4_(nullptr) {



    // Register an exception handler for Geant4:

    G4StateManager::GetStateManager()->SetExceptionHandler(new G4ExceptionHandler());



// Enable multithreading for Geant4 if it has been built with support for it:

#ifdef G4MULTITHREADED

    LOG(INFO) << "Detected Geant4 multithreading capabilities, enabling multithreading support";