update environment settings in server startup scripts

* these use older server conda environments * also remove overlay directory in PYTHONPATH for fmx
NSLS2 · Jan 19, 2023 · 849fbb6 · 849fbb6
1 parent db12867
commit 849fbb6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/bin/lsdcRemote_amx.cmd b/bin/lsdcRemote_amx.cmd
@@ -10,5 +10,5 @@ export LD_LIBRARY_PATH=$matlab_distrib/bin/glnx86:$matlab_distrib/toolbox
 export PINALIGNDIR=${PROJDIR}pinAlign/pin_align-master/
 export MXPROCESSINGSCRIPTSDIR=${PROJDIR}mx-processing/
 # below not ideal as environment name also needed by daq_mainAux
-conda activate lsdc-server-2022-3.2
+conda activate lsdc-server-2023-1.0
 $LSDCHOME/daq_mainAux.py
diff --git a/bin/lsdcRemote_fmx.cmd b/bin/lsdcRemote_fmx.cmd
@@ -10,5 +10,5 @@ export LD_LIBRARY_PATH=$matlab_distrib/bin/glnx86:$matlab_distrib/toolbox
 export PINALIGNDIR=${PROJDIR}pinAlign/pin_align-master/
 export MXPROCESSINGSCRIPTSDIR=${PROJDIR}mx-processing/
 # below not ideal as environment name also needed by daq_mainAux
-conda activate lsdc-server-2022-3.2
+conda activate lsdc-server-2023-1.0
 $LSDCHOME/daq_mainAux.py
diff --git a/bin/lsdcServer_amx.cmd b/bin/lsdcServer_amx.cmd
@@ -10,5 +10,5 @@ export LD_LIBRARY_PATH=$matlab_distrib/bin/glnx86:$matlab_distrib/toolbox
 export PINALIGNDIR=${PROJDIR}pinAlign/pin_align-master/
 export MXPROCESSINGSCRIPTSDIR=${PROJDIR}lsdc-processing/
 # below not idea as environment name also needed by daq_main2
-conda activate lsdc-server-2022-4.0
+conda activate lsdc-server-2023-1.0
 $LSDCHOME/lsdcServer
diff --git a/bin/lsdcServer_fmx.cmd b/bin/lsdcServer_fmx.cmd
@@ -2,13 +2,13 @@
 export PROJDIR=/nsls2/software/mx/daq/
 export CONFIGDIR=${PROJDIR}bnlpx_config/
 export LSDCHOME=${PROJDIR}lsdc_fmx
-export PYTHONPATH="/nsls2/data/fmx/shared/config/lsdc_overlay/lsdc-server-2022-3.1/lib/python3.8/site-packages:.:${CONFIGDIR}:/usr/lib64/edna-mx/mxv1/src:/usr/lib64/edna-mx/kernel/src:${LSDCHOME}:${PROJDIR}/RobotControlLib"
+export PYTHONPATH=".:${CONFIGDIR}:/usr/lib64/edna-mx/mxv1/src:/usr/lib64/edna-mx/kernel/src:${LSDCHOME}:${PROJDIR}/RobotControlLib"
 export PATH=/usr/local/bin:/usr/bin:/bin:${PROJDIR}/software/bin:/opt/ccp4/bin
 source ${CONFIGDIR}daq_env.txt
 export matlab_distrib=${PROJDIR}/software/c3d/matlab_distrib
 export LD_LIBRARY_PATH=$matlab_distrib/bin/glnx86:$matlab_distrib/toolbox
 export PINALIGNDIR=${PROJDIR}pinAlign/pin_align-master/
 export MXPROCESSINGSCRIPTSDIR=${PROJDIR}lsdc-processing/
 # below not idea as environment name also needed by daq_main2
-conda activate lsdc-server-2022-3.2
+conda activate lsdc-server-2023-1.0
 $LSDCHOME/lsdcServer
diff --git a/bin/lsdcServer_nyx.cmd b/bin/lsdcServer_nyx.cmd
@@ -10,5 +10,5 @@ export matlab_distrib=${PROJDIR}/software/c3d/matlab_distrib
 export LD_LIBRARY_PATH=$matlab_distrib/bin/glnx86:$matlab_distrib/toolbox
 export PINALIGNDIR=${PROJDIR}pinAlign/pin_align-master/
 export MXPROCESSINGSCRIPTSDIR=${PROJDIR}lsdc-processing/
-conda activate lsdc-server-2022-3.2
+conda activate lsdc-server-2023-1.0
 $LSDCHOME/lsdcServer