Merge pull request #285 from JunAishima/update-conda-envs-2023-2

Update conda envs 2023 2
NSLS2 · Apr 24, 2023 · fcc2a47 · fcc2a47
2 parents c5e77d4 + 0123526
commit fcc2a47
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 20 deletions.
diff --git a/bin/lsdcGui_amx b/bin/lsdcGui_amx
@@ -5,4 +5,4 @@ export LSDCHOME=${PROJDIR}lsdc_amx
 export PATH=/usr/local/bin:/usr/bin:/bin
 export PYTHONPATH=".:${CONFIGDIR}:/opt/dectris/albula/4.0/python:${LSDCHOME}"
 source ${CONFIGDIR}daq_env_amx.txt
-/opt/conda_envs/lsdc-gui-2022-1-latest/bin/python $LSDCHOME/lsdcGui.py&
+/opt/conda_envs/lsdc-gui-2023-2-latest/bin/python $LSDCHOME/lsdcGui.py&
diff --git a/bin/lsdcGui_fmx b/bin/lsdcGui_fmx
@@ -5,4 +5,4 @@ export LSDCHOME=${PROJDIR}lsdc_fmx
 export PATH=/usr/local/bin:/usr/bin:/bin
 export PYTHONPATH=".:${CONFIGDIR}:/opt/dectris/albula/4.0/python:${LSDCHOME}"
 source ${CONFIGDIR}daq_env.txt
-/opt/conda_envs/lsdc-gui-2022-1.1/bin/python $LSDCHOME/lsdcGui.py&
+/opt/conda_envs/lsdc-gui-2023-2-latest/bin/python $LSDCHOME/lsdcGui.py&
diff --git a/bin/lsdcGui_nyx b/bin/lsdcGui_nyx
@@ -7,4 +7,4 @@ export EPICS_CA_ADDR_LIST=10.67.147.255
 export PATH=/usr/local/bin:/usr/bin:/bin
 export PYTHONPATH=".:${CONFIGDIR}:/opt/dectris/albula/4.0/python:/usr/local/crys/edna-mx/mxv1/src:/usr/local/crys/edna-mx/kernel/src:${LSDCHOME}"
 source ${CONFIGDIR}daq_env_nyx.txt
-/opt/conda_envs/lsdc-gui-2022-1.1/bin/python $LSDCHOME/lsdcGui.py&
+/opt/conda_envs/lsdc-gui-2023-2-latest/bin/python $LSDCHOME/lsdcGui.py&
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-2023-1-latest
+conda activate lsdc-server-2023-2-latest
 $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-2023-1-latest
+conda activate lsdc-server-2023-2-latest
 $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-2023-1-latest
+conda activate lsdc-server-2023-2-latest
 $LSDCHOME/lsdcServer
diff --git a/bin/lsdcServer_fmx.cmd b/bin/lsdcServer_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}lsdc-processing/
 # below not idea as environment name also needed by daq_main2
-conda activate lsdc-server-2023-1-latest
+conda activate lsdc-server-2023-2-latest
 $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-2023-1-latest
+conda activate lsdc-server-2023-2-latest
 $LSDCHOME/lsdcServer
diff --git a/bin/mt-load-check b/bin/mt-load-check
@@ -12,11 +12,11 @@ esac
 case $servorws in
 	ws*)
 		echo Workstation - activating GUI env
-		CONDA_ENV_BASE=/opt/conda_envs/lsdc-gui-2022-1.1
+		CONDA_ENV_BASE=/opt/conda_envs/lsdc-gui-2023-2-latest
 		;;
 	*)
 		echo Server - activating server env
-		CONDA_ENV_BASE=/opt/conda_envs/lsdc-server-2022-3.2
+		CONDA_ENV_BASE=/opt/conda_envs/lsdc-server-2023-2-latest
 		;;
 esac
 echo Running MT_LoadCheck script

diff --git a/daq_main2.py b/daq_main2.py
@@ -1,4 +1,4 @@
-#!/opt/conda_envs/lsdc-server-2023-1-latest/bin/ipython -i
+#!/opt/conda_envs/lsdc-server-2023-2-latest/bin/ipython -i
 """
 The main server for the LSDC system
 """

diff --git a/daq_mainAux.py b/daq_mainAux.py
@@ -1,4 +1,4 @@
-#!/opt/conda_envs/lsdc-server-2023-1-latest/bin/ipython -i
+#!/opt/conda_envs/lsdc-server-2023-2-latest/bin/ipython -i
 """
 The server run when lsdcRemote is used
 """

diff --git a/lsdcServer b/lsdcServer
@@ -1,3 +1,3 @@
 dzdo pkill -KILL -f daq_main2.py
-source /opt/conda_envs/lsdc-server-2023-1-latest/bin/activate
+source /opt/conda_envs/lsdc-server-2023-2-latest/bin/activate
 $LSDCHOME/daq_main2.py
diff --git a/mountCounter.py b/mountCounter.py
@@ -1,4 +1,4 @@
-#!/opt/conda_envs/lsdc-server-2023-1-latest/bin/python
+#!/opt/conda_envs/lsdc-server-2023-2-latest/bin/python
 import lsdb1
 import sys
 

diff --git a/runFastDPH5.py b/runFastDPH5.py
@@ -1,4 +1,4 @@
-#!/opt/conda_envs/lsdc-server-2023-1-latest/bin/python
+#!/opt/conda_envs/lsdc-server-2023-2-latest/bin/python
 import os
 import sys
 import db_lib

diff --git a/runPinAlign.py b/runPinAlign.py
@@ -1,4 +1,4 @@
-#!/opt/conda_envs/lsdc-server-2023-1-latest/bin/python
+#!/opt/conda_envs/lsdc-server-2023-2-latest/bin/python
 import sys
 import os
 

diff --git a/runSpotFinder4syncW.py b/runSpotFinder4syncW.py
@@ -1,4 +1,4 @@
-#!/opt/conda_envs/lsdc-server-2023-1-latest/bin/python
+#!/opt/conda_envs/lsdc-server-2023-2-latest/bin/python
 import time
 import os
 import sys

diff --git a/start_bs.py b/start_bs.py
@@ -1,4 +1,4 @@
-#!/opt/conda_envs/lsdc-server-2023-1-latest/bin/ipython -i
+#!/opt/conda_envs/lsdc-server-2023-2-latest/bin/ipython -i
 # import asyncio
 from ophyd import *
 from ophyd.mca import (Mercury1, SoftDXPTrigger)

diff --git a/sweepDump.py b/sweepDump.py
@@ -1,4 +1,4 @@
-#!/opt/conda_envs/lsdc-server-2023-1-latest/bin/python
+#!/opt/conda_envs/lsdc-server-2023-2-latest/bin/python
 import lsdb1
 import sys
 

diff --git a/wrapGui.py b/wrapGui.py
@@ -1,4 +1,4 @@
-#!/opt/conda_envs/lsdc-gui-2022-1-latest/bin/python
+#!/opt/conda_envs/lsdc-gui-2023-2-latest/bin/python
 """
 If lsdcGui is stopped abnormally, restart it!
 """