From cc0368b767ac6dba0f01ad9ca0e14f61454e7616 Mon Sep 17 00:00:00 2001 From: Jun Aishima Date: Fri, 21 Apr 2023 14:57:36 -0400 Subject: [PATCH 1/3] use latest lsdc-gui-2023-2-latest conda env for GUI --- bin/lsdcGui_amx | 2 +- bin/lsdcGui_fmx | 2 +- bin/lsdcGui_nyx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/lsdcGui_amx b/bin/lsdcGui_amx index 76d95201..b39909a2 100755 --- 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 index 1b203818..e028aee7 100755 --- 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 index 61714578..55d2122d 100755 --- 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& From bb6a239b03cbec11feff5e2787129ae5fa785321 Mon Sep 17 00:00:00 2001 From: Jun Aishima Date: Fri, 21 Apr 2023 14:59:31 -0400 Subject: [PATCH 2/3] update scripts to use lsdc-server-2023-2-latest --- bin/lsdcRemote_amx.cmd | 2 +- bin/lsdcRemote_fmx.cmd | 2 +- bin/lsdcServer_amx.cmd | 2 +- bin/lsdcServer_fmx.cmd | 2 +- bin/lsdcServer_nyx.cmd | 2 +- bin/mt-load-check | 4 ++-- daq_main2.py | 2 +- daq_mainAux.py | 2 +- lsdcServer | 2 +- mountCounter.py | 2 +- runFastDPH5.py | 2 +- runPinAlign.py | 2 +- runSpotFinder4syncW.py | 2 +- start_bs.py | 2 +- sweepDump.py | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bin/lsdcRemote_amx.cmd b/bin/lsdcRemote_amx.cmd index 2d89d635..13f770b7 100755 --- 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 index a543a850..052d8241 100755 --- 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 index 378d1526..64e6d4ed 100755 --- 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 index ed03028d..59e63cfb 100755 --- 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 index c8833c6d..b06b291b 100755 --- 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 index 9ccc5527..59211446 100755 --- 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 index 3884ca6f..07d457c3 100755 --- 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 index 1d25cd49..4d46c43a 100755 --- 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 index e577bd20..0d8001b2 100755 --- 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 index 3c8ddde3..c8fa2285 100755 --- 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 index 24b14172..4263cd6f 100755 --- 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 index bd1e08ca..9c856cf9 100755 --- 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 index 46ca4ac7..f3b1e3cb 100755 --- 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 index 7c6e1630..494dd5fd 100755 --- 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 index e19c2e07..a010cad8 100755 --- 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 From 01235266f4aa39ff3d2fadd934fb7cd0648bfc72 Mon Sep 17 00:00:00 2001 From: Jun Aishima Date: Fri, 21 Apr 2023 15:00:04 -0400 Subject: [PATCH 3/3] update conda env to lsdc-gui-2023-2-latest --- wrapGui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrapGui.py b/wrapGui.py index b8149e4f..171d3bb9 100755 --- 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! """