From deec17872792d9675a78e85cfc2b81a385300f4e Mon Sep 17 00:00:00 2001 From: Jun Aishima Date: Mon, 26 Jun 2023 17:25:29 -0400 Subject: [PATCH] all server and GUI instances will be run from lsdc__prod * development clones of LSDC will be located at /nsls2/software/mx/daq/lsdc_ (the original location), while production clones have been checked out to /nsls2/software/mx/daq/lsdc__prod --- bin/lsdcGui_amx | 2 +- bin/lsdcGui_fmx | 2 +- bin/lsdcGui_nyx | 2 +- 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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/lsdcGui_amx b/bin/lsdcGui_amx index b39909a2..c684d14a 100755 --- a/bin/lsdcGui_amx +++ b/bin/lsdcGui_amx @@ -1,6 +1,6 @@ export PROJDIR=/nsls2/software/mx/daq/ export CONFIGDIR=${PROJDIR}bnlpx_config/ -export LSDCHOME=${PROJDIR}lsdc_amx +export LSDCHOME=${PROJDIR}lsdc_amx_prod export PATH=/usr/local/bin:/usr/bin:/bin export PYTHONPATH=".:${CONFIGDIR}:/opt/dectris/albula/4.0/python:${LSDCHOME}" diff --git a/bin/lsdcGui_fmx b/bin/lsdcGui_fmx index e028aee7..159fdb4c 100755 --- a/bin/lsdcGui_fmx +++ b/bin/lsdcGui_fmx @@ -1,6 +1,6 @@ export PROJDIR=/nsls2/software/mx/daq/ export CONFIGDIR=${PROJDIR}bnlpx_config/ -export LSDCHOME=${PROJDIR}lsdc_fmx +export LSDCHOME=${PROJDIR}lsdc_fmx_prod export PATH=/usr/local/bin:/usr/bin:/bin export PYTHONPATH=".:${CONFIGDIR}:/opt/dectris/albula/4.0/python:${LSDCHOME}" diff --git a/bin/lsdcGui_nyx b/bin/lsdcGui_nyx index 55d2122d..a0aa62ac 100755 --- a/bin/lsdcGui_nyx +++ b/bin/lsdcGui_nyx @@ -1,6 +1,6 @@ export PROJDIR=/nsls2/software/mx/daq/ export CONFIGDIR=${PROJDIR}bnlpx_config/ -export LSDCHOME=${PROJDIR}lsdc_nyx +export LSDCHOME=${PROJDIR}lsdc_nyx_prod export EPICS_CA_AUTO_ADDR_LIST=NO export EPICS_CA_ADDR_LIST=10.67.147.255 diff --git a/bin/lsdcRemote_amx.cmd b/bin/lsdcRemote_amx.cmd index 13f770b7..ee8f0626 100755 --- a/bin/lsdcRemote_amx.cmd +++ b/bin/lsdcRemote_amx.cmd @@ -1,7 +1,7 @@ #!/bin/bash -l export PROJDIR=/nsls2/software/mx/daq/ export CONFIGDIR=${PROJDIR}bnlpx_config/ -export LSDCHOME=${PROJDIR}lsdc_amx +export LSDCHOME=${PROJDIR}lsdc_amx_prod 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_amx.txt diff --git a/bin/lsdcRemote_fmx.cmd b/bin/lsdcRemote_fmx.cmd index 052d8241..a892611b 100755 --- a/bin/lsdcRemote_fmx.cmd +++ b/bin/lsdcRemote_fmx.cmd @@ -1,7 +1,7 @@ #!/bin/bash -l export PROJDIR=/nsls2/software/mx/daq/ export CONFIGDIR=${PROJDIR}bnlpx_config/ -export LSDCHOME=${PROJDIR}lsdc_fmx +export LSDCHOME=${PROJDIR}lsdc_fmx_prod 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 diff --git a/bin/lsdcServer_amx.cmd b/bin/lsdcServer_amx.cmd index 64e6d4ed..24fc70e6 100755 --- a/bin/lsdcServer_amx.cmd +++ b/bin/lsdcServer_amx.cmd @@ -1,7 +1,7 @@ #!/bin/bash -l export PROJDIR=/nsls2/software/mx/daq/ export CONFIGDIR=${PROJDIR}bnlpx_config/ -export LSDCHOME=${PROJDIR}lsdc_amx +export LSDCHOME=${PROJDIR}lsdc_amx_prod 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_amx.txt diff --git a/bin/lsdcServer_fmx.cmd b/bin/lsdcServer_fmx.cmd index 59e63cfb..096bdb41 100755 --- a/bin/lsdcServer_fmx.cmd +++ b/bin/lsdcServer_fmx.cmd @@ -1,7 +1,7 @@ #!/bin/bash -l export PROJDIR=/nsls2/software/mx/daq/ export CONFIGDIR=${PROJDIR}bnlpx_config/ -export LSDCHOME=${PROJDIR}lsdc_fmx +export LSDCHOME=${PROJDIR}lsdc_fmx_prod 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 diff --git a/bin/lsdcServer_nyx.cmd b/bin/lsdcServer_nyx.cmd index b06b291b..e46707bf 100755 --- a/bin/lsdcServer_nyx.cmd +++ b/bin/lsdcServer_nyx.cmd @@ -1,7 +1,7 @@ #!/bin/bash -l export PROJDIR=/nsls2/software/mx/daq/ export CONFIGDIR=${PROJDIR}bnlpx_config/ -export LSDCHOME=${PROJDIR}lsdc_nyx +export LSDCHOME=${PROJDIR}lsdc_nyx_prod export EPICS_CA_AUTO_ADDR_LIST=NO 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