diff --git a/gluex_env.csh b/gluex_env.csh index d1aae39..ff7d895 100644 --- a/gluex_env.csh +++ b/gluex_env.csh @@ -107,7 +107,11 @@ endif if ($?HALLD_RECON_HOME) then echo $PATH | grep $HALLD_RECON_HOME/$BMS_OSNAME/bin > /dev/null if ($status) setenv PATH $HALLD_RECON_HOME/${BMS_OSNAME}/bin:$PATH - setenv PYTHONPATH $HALLD_RECON_HOME/$BMS_OSNAME/python2:$PYTHONPATH + if (`$BUILD_SCRIPTS/python_chooser.sh version` == '3') then + setenv PYTHONPATH $HALLD_RECON_HOME/$BMS_OSNAME/python3:$PYTHONPATH + else + setenv PYTHONPATH $HALLD_RECON_HOME/$BMS_OSNAME/python2:$PYTHONPATH + endif endif # halld_sim if ($?HALLD_SIM_HOME) then diff --git a/gluex_env.sh b/gluex_env.sh index 1bc9cb0..c81dcda 100755 --- a/gluex_env.sh +++ b/gluex_env.sh @@ -177,7 +177,12 @@ then then export PATH=$HALLD_RECON_HOME/${BMS_OSNAME}/bin:$PATH fi - export PYTHONPATH=$HALLD_RECON_HOME/$BMS_OSNAME/python2:$PYTHONPATH + if [ `$BUILD_SCRIPTS/python_chooser.sh version` -eq 3 ] + then + export PYTHONPATH=$HALLD_RECON_HOME/$BMS_OSNAME/python3:$PYTHONPATH + else + export PYTHONPATH=$HALLD_RECON_HOME/$BMS_OSNAME/python2:$PYTHONPATH + fi fi # halld_sim if [ -n "$HALLD_SIM_HOME" ] diff --git a/gluex_env_clean.csh b/gluex_env_clean.csh index 2161961..2bb878e 100644 --- a/gluex_env_clean.csh +++ b/gluex_env_clean.csh @@ -48,7 +48,10 @@ if ($?BUILD_SCRIPTS) then if ($?RCDB_HOME) eval `$BUILD_SCRIPTS/delpath.pl -p $RCDB_HOME/python` if ($?ROOTSYS) eval `$BUILD_SCRIPTS/delpath.pl -p $ROOTSYS/lib` if ($?HALLD_HOME) eval `$BUILD_SCRIPTS/delpath.pl -p $HALLD_HOME/$BMS_OSNAME/python2` - if ($?HALLD_RECON_HOME) eval `$BUILD_SCRIPTS/delpath.pl -p $HALLD_RECON_HOME/$BMS_OSNAME/python2` + if ($?HALLD_RECON_HOME) then + eval `$BUILD_SCRIPTS/delpath.pl -p $HALLD_RECON_HOME/$BMS_OSNAME/python2` + eval `$BUILD_SCRIPTS/delpath.pl -p $HALLD_RECON_HOME/$BMS_OSNAME/python3` + endif if ($?HDGEANT4_HOME) eval `$BUILD_SCRIPTS/delpath.pl -p $HDGEANT4_HOME/g4py` eval `$BUILD_SCRIPTS/delpath.pl -p` endif diff --git a/gluex_env_clean.sh b/gluex_env_clean.sh index b708d6d..ef9fd11 100644 --- a/gluex_env_clean.sh +++ b/gluex_env_clean.sh @@ -52,7 +52,11 @@ if [ -n "$BUILD_SCRIPTS" ]; then if [ -n "$RCDB_HOME" ]; then eval `$BUILD_SCRIPTS/delpath.pl -b -p $RCDB_HOME/python`; fi if [ -n "$ROOTSYS" ]; then eval `$BUILD_SCRIPTS/delpath.pl -b -p $ROOTSYS/lib`; fi if [ -n "$HALLD_HOME" ]; then eval `$BUILD_SCRIPTS/delpath.pl -b -p $HALLD_HOME/$BMS_OSNAME/python2`; fi - if [ -n "$HALLD_RECON_HOME" ]; then eval `$BUILD_SCRIPTS/delpath.pl -b -p $HALLD_RECON_HOME/$BMS_OSNAME/python2`; fi + if [ -n "$HALLD_RECON_HOME" ] + then + eval `$BUILD_SCRIPTS/delpath.pl -b -p $HALLD_RECON_HOME/$BMS_OSNAME/python2` + eval `$BUILD_SCRIPTS/delpath.pl -b -p $HALLD_RECON_HOME/$BMS_OSNAME/python3` + fi if [ -n "$HDGEANT4_HOME" ]; then eval `$BUILD_SCRIPTS/delpath.pl -b -p $HDGEANT4_HOME/g4py`; fi eval `$BUILD_SCRIPTS/delpath.pl -b -p` fi