Merge pull request #258 from JunAishima/one-branch-2023-1-fixes

One branch 2023 1 fixes
NSLS-II · Jan 19, 2023 · 152d0fa · 152d0fa
2 parents b1eecdc + 849fbb6
commit 152d0fa
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 19 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
diff --git a/daq_lib.py b/daq_lib.py
@@ -263,7 +263,7 @@ def mountSample(sampID):
     setPvDesc("robotOmegaWorkPos",90.0)    
     logger.info("done setting work pos")  
   if (currentMountedSampleID != ""): #then unmount what's there
-    if (sampID!=currentMountedSampleID and !robot_lib.multiSampleGripper()):
+    if (sampID!=currentMountedSampleID and not robot_lib.multiSampleGripper()):
       puckPos = mountedSampleDict["puckPos"]
       pinPos = mountedSampleDict["pinPos"]
       if robot_lib.unmountRobotSample(gov_robot, puckPos,pinPos,currentMountedSampleID):

diff --git a/daq_main2.py b/daq_main2.py
@@ -1,4 +1,4 @@
-#!/opt/conda_envs/lsdc-server-2022-4.0/bin/ipython -i
+#!/opt/conda_envs/lsdc-server-2023-1.0/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-2022-4.0/bin/ipython -i
+#!/opt/conda_envs/lsdc-server-2023-1.0/bin/ipython -i
 """
 The server run when lsdcRemote is used
 """

diff --git a/embl_robot.py b/embl_robot.py
@@ -171,7 +171,7 @@ def testRobot(self):
         logger.error(message)
 
 
-    def multiSampleGripper():
+    def multiSampleGripper(self):
       return False
 
     def openGripper(self):

diff --git a/fmx_annealer.py b/fmx_annealer.py
@@ -105,7 +105,7 @@ def govStateSet(stateStr, configStr = 'Robot'):
     return
 
 from ophyd import PVPositioner, PVPositionerPC, Device, Component as Cpt, EpicsMotor, EpicsSignal, EpicsSignalRO
-from ophyd import SubscriptionStatus
+from ophyd.status import SubscriptionStatus
 
 # XF:17IDC-ES:FMX{Wago:1}AnnealerIn-Sts
 # XF:17IDC-ES:FMX{Wago:1}AnnealerAir-Sel

diff --git a/lsdcGui.py b/lsdcGui.py
@@ -2758,8 +2758,6 @@ def createSampleTab(self):
           self.vidActionRasterExploreRadio.setDisabled(True)
           self.vidActionRasterDefRadio.setDisabled(True)
           self.vidActionDefineCenterRadio.setDisabled(True)
-        else:
-          return
 
         hutchCornerCamThread = VideoThread(parent=self, delay=HUTCH_TIMER_DELAY, url=getBlConfig('hutchCornerCamURL'))
         hutchCornerCamThread.frame_ready.connect(lambda frame: self.updateCam(self.pixmap_item_HutchCorner, frame))

diff --git a/lsdcServer b/lsdcServer
@@ -1,3 +1,3 @@
 dzdo pkill -KILL -f daq_main2.py
-source /opt/conda_envs/lsdc-server-2022-4.0/bin/activate
+source /opt/conda_envs/lsdc-server-2023-1.0/bin/activate
 $LSDCHOME/daq_main2.py
diff --git a/runFastDPH5.py b/runFastDPH5.py
@@ -1,4 +1,4 @@
-#!/opt/conda_envs/lsdc-server-2022-4.0/bin/python
+#!/opt/conda_envs/lsdc-server-2023-1.0/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-2022-4.0/bin/python
+#!/opt/conda_envs/lsdc-server-2023-1.0/bin/python
 import sys
 import os
 

diff --git a/runSpotFinder4syncW.py b/runSpotFinder4syncW.py
@@ -1,4 +1,4 @@
-#!/opt/conda_envs/lsdc-server-2022-4.0/bin/python
+#!/opt/conda_envs/lsdc-server-2023-1.0/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-2022-4.0/bin/ipython -i
+#!/opt/conda_envs/lsdc-server-2023-1.0/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-2022-4.0/bin/python
+#!/opt/conda_envs/lsdc-server-2023-1.0/bin/python
 import lsdb1
 import sys