Skip to content
Snippets Groups Projects
Commit f1758e62 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

Remove xenv references

parent 84f3cb75
Branches
No related tags found
1 merge request!234Remove xenv references
...@@ -120,7 +120,6 @@ mkdir -p results ...@@ -120,7 +120,6 @@ mkdir -p results
# Run Juggler # Run Juggler
FULL_CAL_OPTION_DIR=benchmarks/clustering/options FULL_CAL_OPTION_DIR=benchmarks/clustering/options
xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
gaudirun.py ${FULL_CAL_OPTION_DIR}/full_cal_reco.py gaudirun.py ${FULL_CAL_OPTION_DIR}/full_cal_reco.py
if [[ "$?" -ne "0" ]] ; then if [[ "$?" -ne "0" ]] ; then
echo "ERROR running digitization (juggler)" echo "ERROR running digitization (juggler)"
......
...@@ -98,10 +98,8 @@ if 'rec' in procs: ...@@ -98,10 +98,8 @@ if 'rec' in procs:
os.environ['JUGGLER_COMPACT_PATH'] = args.compact os.environ['JUGGLER_COMPACT_PATH'] = args.compact
os.environ['JUGGLER_N_EVENTS'] = '{}'.format(args.nev) os.environ['JUGGLER_N_EVENTS'] = '{}'.format(args.nev)
juggler_xenv = os.path.join(os.environ.get('JUGGLER_INSTALL_PREFIX', '../local'), 'Juggler.xenv')
for opt in opt_scripts: for opt in opt_scripts:
rec_cmd = ['xenv', '-x', juggler_xenv, 'gaudirun.py', os.path.join(sdir, 'options', opt)] rec_cmd = ['gaudirun.py', os.path.join(sdir, 'options', opt)]
return_code = subprocess.run(rec_cmd).returncode return_code = subprocess.run(rec_cmd).returncode
if return_code is not None and return_code < 0: if return_code is not None and return_code < 0:
print('ERROR running juggler ({})!'.format(opt)) print('ERROR running juggler ({})!'.format(opt))
......
...@@ -96,7 +96,7 @@ rootls -t ${JUGGLER_SIM_FILE} ...@@ -96,7 +96,7 @@ rootls -t ${JUGGLER_SIM_FILE}
if [[ -z "${ANALYSIS_ONLY}" ]] ; if [[ -z "${ANALYSIS_ONLY}" ]] ;
then then
# Need to figure out how to pass file name to juggler from the commandline # Need to figure out how to pass file name to juggler from the commandline
xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv gaudirun.py benchmarks/far_forward/options/far_forward_reconstruction.py gaudirun.py benchmarks/far_forward/options/far_forward_reconstruction.py
if [[ "$?" -ne "0" ]] ; then if [[ "$?" -ne "0" ]] ; then
echo "ERROR running juggler" echo "ERROR running juggler"
exit 1 exit 1
......
...@@ -105,7 +105,6 @@ mkdir -p results ...@@ -105,7 +105,6 @@ mkdir -p results
CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options
# Run Juggler # Run Juggler
xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
gaudirun.py ${CB_EMCAL_OPTION_DIR}/hybrid_cluster.py gaudirun.py ${CB_EMCAL_OPTION_DIR}/hybrid_cluster.py
# gaudirun.py ${CB_EMCAL_OPTION_DIR}/imaging_topocluster.py # gaudirun.py ${CB_EMCAL_OPTION_DIR}/imaging_topocluster.py
if [[ "$?" -ne "0" ]] ; then if [[ "$?" -ne "0" ]] ; then
......
...@@ -106,7 +106,6 @@ mkdir -p results ...@@ -106,7 +106,6 @@ mkdir -p results
CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options
# Run Juggler # Run Juggler
xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
gaudirun.py ${CB_EMCAL_OPTION_DIR}/hybrid_cluster.py gaudirun.py ${CB_EMCAL_OPTION_DIR}/hybrid_cluster.py
# gaudirun.py ${CB_EMCAL_OPTION_DIR}/imaging_topocluster.py # gaudirun.py ${CB_EMCAL_OPTION_DIR}/imaging_topocluster.py
if [[ "$?" -ne "0" ]] ; then if [[ "$?" -ne "0" ]] ; then
......
...@@ -101,7 +101,6 @@ mkdir -p results ...@@ -101,7 +101,6 @@ mkdir -p results
CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options
# Run Juggler # Run Juggler
xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
gaudirun.py ${CB_EMCAL_OPTION_DIR}/imaging_2dcluster.py gaudirun.py ${CB_EMCAL_OPTION_DIR}/imaging_2dcluster.py
if [[ "$?" -ne "0" ]] ; then if [[ "$?" -ne "0" ]] ; then
echo "ERROR running juggler" echo "ERROR running juggler"
......
...@@ -84,9 +84,7 @@ if 'rec' in procs: ...@@ -84,9 +84,7 @@ if 'rec' in procs:
'IMCAL_ML_COMBINE': str(args.combine_method), 'IMCAL_ML_COMBINE': str(args.combine_method),
}) })
juggler_xenv = os.path.join(os.environ.get('JUGGLER_INTALL_PREFIX', '../local'), 'Juggler.xenv')
rec_cmd = [ rec_cmd = [
'xenv', '-x', juggler_xenv, # v35+ do not need xenv anymore
'gaudirun.py', os.path.join(sdir, 'options', 'imaging_ml_data.py') 'gaudirun.py', os.path.join(sdir, 'options', 'imaging_ml_data.py')
] ]
return_code = subprocess.run(rec_cmd, env=run_env).returncode return_code = subprocess.run(rec_cmd, env=run_env).returncode
......
...@@ -71,7 +71,6 @@ if [[ "$?" -ne "0" ]] ; then ...@@ -71,7 +71,6 @@ if [[ "$?" -ne "0" ]] ; then
fi fi
# @TODO changeable simulation file name and detector xml file name # @TODO changeable simulation file name and detector xml file name
xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
gaudirun.py benchmarks/rich/options/rich_reco.py gaudirun.py benchmarks/rich/options/rich_reco.py
if [[ "$?" -ne "0" ]] ; then if [[ "$?" -ne "0" ]] ; then
echo "ERROR running juggler" echo "ERROR running juggler"
......
...@@ -80,7 +80,7 @@ rootls -t ${JUGGLER_SIM_FILE} ...@@ -80,7 +80,7 @@ rootls -t ${JUGGLER_SIM_FILE}
if [[ -z "${ANALYSIS_ONLY}" ]] ; if [[ -z "${ANALYSIS_ONLY}" ]] ;
then then
# Need to figure out how to pass file name to juggler from the commandline # Need to figure out how to pass file name to juggler from the commandline
xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv gaudirun.py benchmarks/track_finding/options/track_reconstruction.py gaudirun.py benchmarks/track_finding/options/track_reconstruction.py
if [[ "$?" -ne "0" ]] ; then if [[ "$?" -ne "0" ]] ; then
echo "ERROR running juggler" echo "ERROR running juggler"
exit 1 exit 1
......
...@@ -83,7 +83,7 @@ rootls -t ${JUGGLER_SIM_FILE} ...@@ -83,7 +83,7 @@ rootls -t ${JUGGLER_SIM_FILE}
if [[ -z "${ANALYSIS_ONLY}" ]] ; if [[ -z "${ANALYSIS_ONLY}" ]] ;
then then
# Need to figure out how to pass file name to juggler from the commandline # Need to figure out how to pass file name to juggler from the commandline
xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv gaudirun.py benchmarks/track_fitting/options/track_reconstruction.py gaudirun.py benchmarks/track_fitting/options/track_reconstruction.py
if [[ "$?" -ne "0" ]] ; then if [[ "$?" -ne "0" ]] ; then
echo "ERROR running juggler" echo "ERROR running juggler"
exit 1 exit 1
......
...@@ -96,7 +96,7 @@ rootls -t ${JUGGLER_SIM_FILE} ...@@ -96,7 +96,7 @@ rootls -t ${JUGGLER_SIM_FILE}
if [[ -z "${ANALYSIS_ONLY}" ]] ; if [[ -z "${ANALYSIS_ONLY}" ]] ;
then then
# Need to figure out how to pass file name to juggler from the commandline # Need to figure out how to pass file name to juggler from the commandline
xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv gaudirun.py benchmarks/tracking/options/track_reconstruction.py gaudirun.py benchmarks/tracking/options/track_reconstruction.py
if [[ "$?" -ne "0" ]] ; then if [[ "$?" -ne "0" ]] ; then
echo "ERROR running juggler" echo "ERROR running juggler"
exit 1 exit 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment