Skip to content

fix(mcconfigurator): Fix to run without TGeant3 #1622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
karabowi wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(mcconfigurator): Fix to run without TGeant3 #1622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
################################################################################
# Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH #
# Copyright (C) 2014-2025 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH #
# #
# This software is distributed under the terms of the #
# GNU Lesser General Public Licence (LGPL) version 3, #
Expand All @@ -11,17 +11,17 @@ add_subdirectory(common/mcstack)

set(mcEngine_list TGeant4)

if(TARGET MCConfigurator)
add_subdirectory(common/gconfig)
endif()

if(Geant3_FOUND)
if(ENABLE_GEANT3_TESTING)
list(APPEND mcEngine_list TGeant3)
endif()
if(TARGET FairRoot::EventDisplay)
add_subdirectory(common/eventdisplay)
endif()
if(TARGET MCConfigurator)
add_subdirectory(common/gconfig)
endif()

endif()

if(TARGET FairRoot::FastSim AND TARGET Boost::program_options)
Expand Down
3 changes: 1 addition & 2 deletions fairroot/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ else()
message(STATUS "eventdisplay will not be built, because ROOT has no opengl support.")
endif()

if(Geant3_FOUND AND Geant4VMC_FOUND AND yaml-cpp_FOUND
AND TARGET FairRoot::FastSim)
if(yaml-cpp_FOUND)
add_subdirectory(mcconfigurator)
endif()

Expand Down
32 changes: 27 additions & 5 deletions fairroot/mcconfigurator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
################################################################################
# Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH #
# Copyright (C) 2014-2025 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH #
# #
# This software is distributed under the terms of the #
# GNU Lesser General Public Licence (LGPL) version 3, #
Expand All @@ -22,22 +22,44 @@ target_include_directories(${target} PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)

# Set compile definition
if(Geant3_FOUND)
target_compile_definitions(${target} PUBLIC FAIRROOT_HAS_GEANT3)
endif()
if(Geant4VMC_FOUND)
target_compile_definitions(${target} PUBLIC FAIRROOT_HAS_GEANT4)
endif()
if(TARGET FairRoot::FastSim)
target_compile_definitions(${target} PUBLIC FAIRROOT_HAS_FASTSIM)
endif()

target_link_libraries(${target}
PUBLIC
FairRoot::Base # FairGenericVMCConfig
yaml-cpp::yaml-cpp

PRIVATE
FairRoot::Tools
FairRoot::FastSim # FairFastSimRunConfiguration

geant321
geant4vmc

ROOT::Core
${VMCLIB}
)

if(Geant3_FOUND)
target_link_libraries(${target}
PUBLIC
geant321
)
endif()

if(Geant4VMC_FOUND)
target_link_libraries(${target}
PUBLIC
geant4vmc
$<IF:$<TARGET_EXISTS:FairRoot::FastSim>,FairRoot::FastSim,> # FairFastSimRunConfiguration
)
endif()

fairroot_target_root_dictionary(${target}
HEADERS ${headers}
LINKDEF LinkDef.h
Expand Down
61 changes: 49 additions & 12 deletions fairroot/mcconfigurator/FairYamlVMCConfig.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/********************************************************************************
* Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* Copyright (C) 2014-2025 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, *
Expand All @@ -11,15 +11,11 @@
// -------------------------------------------------------------------------
#include "FairYamlVMCConfig.h"

#include "FairFastSimRunConfiguration.h"
#include "FairLogger.h"
#include "FairRunSim.h"
#include "FairSink.h" // for FairSink

#include <Rtypes.h>
#include <TGeant3.h>
#include <TGeant3TGeo.h>
#include <TGeant4.h>
#include <TObjString.h> // for TObjString
#include <TObject.h> // for TObject, TObject::kSingleKey
#include <TString.h>
Expand All @@ -32,11 +28,21 @@
#include <string> // for string, basic_string, cha...
#include <vector> // for vector

#ifdef FAIRROOT_HAS_FASTSIM
#include "FairFastSimRunConfiguration.h"
#endif
#ifdef FAIRROOT_HAS_GEANT3
#include <TGeant3.h>
#include <TGeant3TGeo.h>
#endif
#ifdef FAIRROOT_HAS_GEANT4
#include <TGeant4.h>
#endif

FairYamlVMCConfig::FairYamlVMCConfig()
: FairGenericVMCConfig()
, fMCEngine("")
{
}
{}

void FairYamlVMCConfig::Setup(const char* mcEngine)
{
Expand All @@ -61,7 +67,8 @@ void FairYamlVMCConfig::Setup(const char* mcEngine)

void FairYamlVMCConfig::SetupPostInit(const char* mcEngine)
{
if ( !fPostInitFlag ) {
#ifdef FAIRROOT_HAS_GEANT4
if (!fPostInitFlag) {
LOG(info) << "FairYamlVMCConfig::SetupPostInit() OFF." << fPostInitName;
return;
}
Expand All @@ -85,7 +92,7 @@ void FairYamlVMCConfig::SetupPostInit(const char* mcEngine)
g4Macro = "g4ConfigPostInit.C";
fPostInitName = g4Macro;
} else {
if (fPostInitName.find("/")!=std::string::npos) {
if (fPostInitName.find("/") != std::string::npos) {
AbsPath = kTRUE;
}
g4Macro = fPostInitName;
Expand All @@ -105,19 +112,27 @@ void FairYamlVMCConfig::SetupPostInit(const char* mcEngine)
fYamlConfigPostInit = YAML::LoadFile(ConfigMacro.Data());

if (fYamlConfigPostInit["Geant4_PostInit_Commands"]) {
std::vector<std::string> g4commands = fYamlConfigPostInit["Geant4_PostInit_Commands"].as<std::vector<std::string>>();
for ( const auto& value: g4commands ) {
std::vector<std::string> g4commands =
fYamlConfigPostInit["Geant4_PostInit_Commands"].as<std::vector<std::string>>();
for (const auto& value : g4commands) {
LOG(info) << " execute command \"" << value << "\"";
TGeant4* geant4 = dynamic_cast<TGeant4*>(TVirtualMC::GetMC());
geant4->ProcessGeantCommand(value.c_str());
}
}

LOG(info) << "got info from " << fPostInitName;
#else
LOG(fatal) << "FairYamlVMCConfig::SetupPostInit() - Geant4 support is not available! "
<< "FairRoot was compiled without Geant4. "
<< "Please use TGeant3 or recompile FairRoot with Geant4 support.";

#endif
}

void FairYamlVMCConfig::SetupGeant3()
{
#ifdef FAIRROOT_HAS_GEANT3
LOG(info) << "FairYamlVMCConfig::SetupGeant3() called";
FairRunSim* fRun = FairRunSim::Instance();
TString* gModel = fRun->GetGeoModel();
Expand Down Expand Up @@ -156,10 +171,18 @@ void FairYamlVMCConfig::SetupGeant3()
geant3->SetERAN(fYamlConfig["G3_ERAN"].as<double>());
if (fYamlConfig["G3_CKOV"])
geant3->SetCKOV(fYamlConfig["G3_CKOV"].as<int>());

LOG(info) << geant3->GetName() << " MonteCarlo engine created!.";
#else
LOG(fatal) << "FairYamlVMCConfig::SetupGeant3() - Geant3 support is not available! "
<< "FairRoot was compiled without Geant3. "
<< "Please use TGeant4 or recompile FairRoot with Geant3 support.";
#endif
}

void FairYamlVMCConfig::SetupGeant4()
{
#ifdef FAIRROOT_HAS_GEANT4
LOG(info) << "FairYamlVMCConfig::SetupGeant4() called";

if (!fYamlConfig["Geant4_UserGeometry"]) {
Expand Down Expand Up @@ -191,13 +214,22 @@ void FairYamlVMCConfig::SetupGeant4()

auto const useFastSim(fYamlConfig["UseFastSim"] ? fYamlConfig["UseFastSim"].as<bool>() : fUseFastSimDefault);
std::unique_ptr<TG4RunConfiguration> runConfiguration;
#ifdef FAIRROOT_HAS_FASTSIM
if (useFastSim) {
runConfiguration = std::make_unique<FairFastSimRunConfiguration>(
g4UserGeometry, g4PhysicsList, g4SpecialProcess, specialStacking, mtMode);
} else {
} else
#endif
{
runConfiguration = std::make_unique<TG4RunConfiguration>(
g4UserGeometry, g4PhysicsList, g4SpecialProcess, specialStacking, mtMode);
}
#ifndef FAIRROOT_HAS_FASTSIM
if (useFastSim) {
LOG(warning) << "UseFastSim is enabled but FairRoot was compiled without FastSim support. "
<< "Using standard TG4RunConfiguration instead.";
}
#endif

// Instantiate a singleton like object, "leaking" it is the current API
TGeant4* geant4 = new TGeant4("TGeant4", "The Geant4 Monte Carlo", runConfiguration.release());
Expand All @@ -215,6 +247,11 @@ void FairYamlVMCConfig::SetupGeant4()
}

LOG(info) << geant4->GetName() << " MonteCarlo engine created!.";
#else
LOG(fatal) << "FairYamlVMCConfig::SetupGeant4() - Geant4 support is not available! "
<< "FairRoot was compiled without Geant4. "
<< "Please use TGeant3 or recompile FairRoot with Geant4 support.";
#endif
}

void FairYamlVMCConfig::SetCuts()
Expand Down