Skip to content

Commit 8cb3f91

Browse files
Merge pull request #903 from lgarren/feature/lg_geant4_11
build with geant4 v4_11_2_p02
2 parents 9022e7b + 18f9f5b commit 8cb3f91

5 files changed

Lines changed: 12 additions & 163 deletions

File tree

sbndcode/JobConfigurations/standard/detsim/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ FILE(GLOB fcl_files *.fcl)
44
install_source(EXTRAS ${fcl_files} )
55

66
add_subdirectory(detector_variations)
7-
add_subdirectory(legacy)
7+
# LegacyLArG4 is not supported when using geant4 4.11
8+
##add_subdirectory(legacy)
89

sbndcode/JobConfigurations/standard/g4/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ add_subdirectory(recomb_variations)
77
add_subdirectory(crt_filter)
88
add_subdirectory(optical_sim)
99

10-
add_subdirectory(legacy)
10+
# LegacyLArG4 is not supported when using geant4 4.11
11+
##add_subdirectory(legacy)

sbndcode/LArG4/legacy_largeantmodules_sbnd.fcl

Lines changed: 0 additions & 8 deletions
This file was deleted.

sbndcode/LArG4/legacy_simulationservices_sbnd.fcl

Lines changed: 0 additions & 146 deletions
This file was deleted.

test/fcl/testFHiCLfiles_sbnd.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,14 @@ if [[ -n "$MRB_BUILDDIR" ]]; then
4646
fi
4747
fi
4848

49-
if [[ -n "$MRB_SOURCE" ]]; then
50-
SourceFHiCLdir="${MRB_SOURCE}/sbndcode/sbndcode/JobConfigurations"
51-
if [[ -d "$SourceFHiCLdir" ]]; then
52-
echo "Will test the job configuration directory in MRB source area ('${SourceFHiCLdir}')"
53-
TestDirs+=( "$SourceFHiCLdir" )
54-
fi
55-
fi
49+
# DO NOT test files that are not installed
50+
#if [[ -n "$MRB_SOURCE" ]]; then
51+
# SourceFHiCLdir="${MRB_SOURCE}/sbndcode/sbndcode/JobConfigurations"
52+
# if [[ -d "$SourceFHiCLdir" ]]; then
53+
# echo "Will test the job configuration directory in MRB source area ('${SourceFHiCLdir}')"
54+
# TestDirs+=( "$SourceFHiCLdir" )
55+
# fi
56+
#fi
5657

5758
if [[ "${#TestDirs[@]}]" == 0 ]]; then
5859
echo "FATAL: no suitable FHiCL directory found to be tested!" >&2

0 commit comments

Comments
 (0)