Commit bb521d0f authored by Paul Schütze's avatar Paul Schütze
Browse files

Merge branch 'fix_visualization' into 'master' 

Fix Issues with VisualizationGeant4

See merge request allpix-squared/allpix-squared!669
parents 3159855a 08695a9b

src/modules/VisualizationGeant4/CMakeLists.txt

+3 −0
Original line number Diff line number Diff line
@@ -29,5 +29,8 @@ TARGET_INCLUDE_DIRECTORIES(${MODULE_NAME} SYSTEM PRIVATE ${Geant4_INCLUDE_DIRS}) 
# Add Geant4 libraries

TARGET_LINK_LIBRARIES(${MODULE_NAME} ${Geant4_LIBRARIES})



# Allpix Geant4 interface is required for this module

ALLPIX_MODULE_REQUIRE_GEANT4_INTERFACE(${MODULE_NAME})



# Provide standard install target

ALLPIX_MODULE_INSTALL(${MODULE_NAME})

src/modules/VisualizationGeant4/VisualizationGeant4Module.cpp

+5 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 


#include "core/config/exceptions.h"

#include "core/utils/log.h"

#include "tools/geant4/G4LoggingDestination.hpp"



using namespace allpix;
@@ -63,7 +64,7 @@ VisualizationGeant4Module::~VisualizationGeant4Module() { 
    std::string driver;

    try {

        driver = config_.get<std::string>("driver", "");

    } catch(InvalidKeyError& e) {

    } catch(ConfigurationError& e) {

        driver = "";

    }
@@ -159,6 +160,9 @@ void VisualizationGeant4Module::initialize() { 
    if(config_.has("macro_init")) {

        UI->ApplyCommand("/control/execute " + config_.getPath("macro_init", true).string());

    }



    // Force logging through our framework again since it seems to be reset during initialization:

    UI->SetCoutDestination(G4LoggingDestination::getInstance());

}



/**