Skip to content

Commit befe83d

Browse files
committed
Fix the PostInitConfig flag in FairYamlVMCConfig
By mistake, the flag was set to true in the constructor. Added log output in the file for the auto tests. Move EGPythia6 requirement to fairtools MCConfigurator directory. Setting property PIC for example MQ pixel.
1 parent 3d9929f commit befe83d

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

examples/MQ/pixelDetector/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ list(APPEND headers
5757
add_library(${target} SHARED ${sources} ${no_dict_sources} ${headers} ${no_dict_headers})
5858
add_library(FairRoot::${target} ALIAS ${target})
5959
set_target_properties(${target} PROPERTIES ${PROJECT_LIBRARY_PROPERTIES})
60+
set_property(TARGET ${target} PROPERTY POSITION_INDEPENDENT_CODE ON)
6061

6162
target_include_directories(${target} PUBLIC
6263
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
@@ -93,7 +94,6 @@ target_link_libraries(${target} PUBLIC
9394
Physics
9495
Geom
9596
Hist
96-
EGPythia6
9797
${VMCLIB}
9898
)
9999

examples/common/gconfig/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ target_link_libraries(${target} PUBLIC
3737
FairRoot::MCConfigurator # FairYamlVMCConfig
3838
FairRoot::ExMCStack # FairStack
3939

40-
EGPythia6
4140
${VMCLIB} # TVirtualMC
4241
)
4342

fairtools/MCConfigurator/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ target_link_libraries(${target} PUBLIC
4141

4242
Core
4343
${VMCLIB}
44+
EGPythia6
4445
)
4546

4647
fairroot_target_root_dictionary(${target}

fairtools/MCConfigurator/FairYamlVMCConfig.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ FairYamlVMCConfig::FairYamlVMCConfig()
3535
: FairGenericVMCConfig()
3636
, fMCEngine("")
3737
{
38-
UsePostInitConfig();
3938
}
4039

4140
void FairYamlVMCConfig::Setup(const char* mcEngine)
@@ -69,6 +68,7 @@ void FairYamlVMCConfig::SetupPostInit(const char* mcEngine)
6968
if (!((strcmp(mcEngine, "TGeant4") == 0))) {
7069
LOG(fatal) << "FairYamlVMCConfig::SetupPostInit() only valid for TGeant4.";
7170
}
71+
LOG(info) << "Loading Geant4 PostInit Config." << endl;
7272

7373
TString work = getenv("VMCWORKDIR");
7474
TString work_config = work + "/gconfig/";

0 commit comments

Comments
 (0)