Skip to content
Snippets Groups Projects

Cleaned up and simplified the config/env.sh and util/build.sh

Merged Whitney Armstrong requested to merge cleanup into master
15 files
+ 114
116
Compare changes
  • Side-by-side
  • Inline
Files
15
  •  - We should limit the number of new environment variables. They
     increase complexity which should be mostly absorbed by using containers.
     - Any new environment variables should be set via the ci yml file
     or defined the UI. https://docs.gitlab.com/ee/ci/variables/README.html#custom-environment-variables
     - Removed dummy scripts
     - Removed dvmp dummy jobs.
     - Fixed dvmp output data. Note the out artifacts should go in
     `results/dvmp` if they are in the `dvmp` directory. This will just make
     things easier later on for collecting and summarizing results.
     - updated  dvmp/scripts/run_generator_instance.sh
     - Added dvmp.sh to run geant4/reconstruction. Note `dvmp/dvmp.sh` could be named something more specific, like `dvmp/dvmp_barrel_decays.sh` depending on the input, analysis, etc...
+ 8
7
@@ -12,17 +12,18 @@ if [[ ! -n "${JUGGLER_INSTALL_PREFIX}" ]] ; then
export JUGGLER_INSTALL_PREFIX="/usr/local"
fi
# not sure this is needed
if [[ ! -n "${DETECTOR_PREFIX}" ]]; then
export DETECTOR_PREFIX=detector
# reuse the custom juggler install prefix for detector
export DETECTOR_INSTALL_PREFIX=${JUGGLER_INSTALL_PREFIX}
fi
## ensure absolute paths
# not sure this is needed either
export JUGGLER_INSTALL_PREFIX=`realpath ${JUGGLER_INSTALL_PREFIX}`
export DETECTOR_PREFIX=`realpath ${DETECTOR_PREFIX}`
## setup detector paths
export LD_LIBRARY_PATH=${DETECTOR_PREFIX}/lib:$LD_LIBRARY_PATH
export DETECTOR_SOURCE_PATH=${DETECTOR_PREFIX}/src
export DETECTOR_INSTALL_PREFIX=`realpath ${DETECTOR_INSTALL_PREFIX}`
## setup root results artifact path
export RESULTS_PATH=`realpath results`
# this should be in the CI File instead
# https://docs.gitlab.com/ee/ci/yaml/README.html#variables
# export RESULTS_PATH=`realpath results`
Loading