diff --git a/CROWN b/CROWN index 732e5f6..63b4ae5 160000 --- a/CROWN +++ b/CROWN @@ -1 +1 @@ -Subproject commit 732e5f60d873a4ac19ad5e009abdf8d138f473de +Subproject commit 63b4ae55ba28bf08765217d1742e59ddc1f60d55 diff --git a/law b/law index c577a91..2f5aaec 160000 --- a/law +++ b/law @@ -1 +1 @@ -Subproject commit c577a91bfe160bbaaf599999547ff4ddede0c098 +Subproject commit 2f5aaecc2c5f2aa0d64a77d12f8b5945d63928a7 diff --git a/processor/tasks/CROWNFriend.py b/processor/tasks/CROWNFriend.py index e3fcfe8..eff5dfd 100644 --- a/processor/tasks/CROWNFriend.py +++ b/processor/tasks/CROWNFriend.py @@ -412,7 +412,9 @@ def run(self): # the quantities of a scope have to be read from a rootfile of that scope, # the scope is the last folder in the path of the rootfile scope_inputs = [ - target for target in rootfiles if target.path.split("/")[-2] == scope + target + for target in rootfiles + if target.path.split("/")[-2] == scope ] if len(scope_inputs) == 0: raise Exception(f"No input rootfile found for scope {scope}") diff --git a/processor/tasks/scripts/compile_crown.sh b/processor/tasks/scripts/compile_crown.sh index ea98e3f..69d1ce3 100644 --- a/processor/tasks/scripts/compile_crown.sh +++ b/processor/tasks/scripts/compile_crown.sh @@ -36,6 +36,9 @@ mkdir -p "${BUILDDIR}" # --- CMake Configuration --- # We use the compilers and libraries provided by the container's Conda 'env' +# Pin CMAKE_PREFIX_PATH to the ROOT install found via root-config: on hosts +# that also have a system ROOT RPM installed, find_package(ROOT) can otherwise +# silently resolve to that instead of the intended CVMFS/conda install. if cmake "${CROWNFOLDER}" \ -DANALYSIS="${ANALYSIS}" \ -DCONFIG="${CONFIG}" \ @@ -46,6 +49,7 @@ if cmake "${CROWNFOLDER}" \ -DTHREADS="${EXECUTABLE_THREADS}" \ -DINSTALLDIR="${INSTALLDIR}" \ -DPRODUCTION=True \ + -DCMAKE_PREFIX_PATH="$(root-config --prefix)" \ -B"${BUILDDIR}" 2>&1 | tee "${BUILDDIR}/cmake.log"; then echo "CMake finished successfully" else diff --git a/processor/tasks/scripts/compile_crown_friends.sh b/processor/tasks/scripts/compile_crown_friends.sh index 0799ee7..0755c11 100644 --- a/processor/tasks/scripts/compile_crown_friends.sh +++ b/processor/tasks/scripts/compile_crown_friends.sh @@ -34,6 +34,9 @@ mkdir -p "${BUILDDIR}" # --- CMake Configuration --- # We use the compilers and libraries provided by the container's Conda 'env' +# Pin CMAKE_PREFIX_PATH to the ROOT install found via root-config: on hosts +# that also have a system ROOT RPM installed, find_package(ROOT) can otherwise +# silently resolve to that instead of the intended CVMFS/conda install. if cmake "${CROWNFOLDER}" \ -DANALYSIS="${ANALYSIS}" \ -DCONFIG="${CONFIG}" \ @@ -45,6 +48,7 @@ if cmake "${CROWNFOLDER}" \ -DPRODUCTION=True \ -DFRIENDS=true \ -DQUANTITIESMAP="${QUANTITIESMAP}" \ + -DCMAKE_PREFIX_PATH="$(root-config --prefix)" \ -B"${BUILDDIR}" 2>&1 | tee "${BUILDDIR}/cmake.log"; then echo "CMake finished successfully" else diff --git a/processor/tasks/scripts/compile_crown_lib.sh b/processor/tasks/scripts/compile_crown_lib.sh index 8b8e619..c302329 100644 --- a/processor/tasks/scripts/compile_crown_lib.sh +++ b/processor/tasks/scripts/compile_crown_lib.sh @@ -31,10 +31,14 @@ mkdir -p "${BUILDDIR}" # --- CMake Configuration --- # We use the compilers and libraries provided by the container's Conda 'env' +# Pin CMAKE_PREFIX_PATH to the ROOT install found via root-config: on hosts +# that also have a system ROOT RPM installed, find_package(ROOT) can otherwise +# silently resolve to that instead of the intended CVMFS/conda install. if cmake "${CROWNFOLDER}" \ -DBUILD_CROWNLIB_ONLY=ON \ -DINSTALLDIR="${INSTALLDIR}" \ -DANALYSIS="${ANALYSIS}" \ + -DCMAKE_PREFIX_PATH="$(root-config --prefix)" \ -B"${BUILDDIR}" 2>&1 | tee "${BUILDDIR}/cmake.log"; then echo "CMake finished successful." else diff --git a/sample_database b/sample_database index 1bba58e..077ff13 160000 --- a/sample_database +++ b/sample_database @@ -1 +1 @@ -Subproject commit 1bba58ed815ca70e0f43efb24bb9ab3b13a4c7fa +Subproject commit 077ff132733d8dbbb5f146894cf34e9dcfe9c49d