diff --git a/eco/acquisition/scan.py b/eco/acquisition/scan.py index ebb6781..8998571 100755 --- a/eco/acquisition/scan.py +++ b/eco/acquisition/scan.py @@ -1,4 +1,3 @@ -import pyscan import os import json import numpy as np diff --git a/eco/aliases/namespaces/bernina.json b/eco/aliases/namespaces/bernina.json index 45152a3..977af34 100644 --- a/eco/aliases/namespaces/bernina.json +++ b/eco/aliases/namespaces/bernina.json @@ -1 +1 @@ -[{"alias": "xrd.xbase.readback", "channel": "SARES21-XRD:MOT_TX.RBV", "channeltype": "CA"}, {"alias": "xrd.xbase.user_offset", "channel": "SARES21-XRD:MOT_TX.OFF", "channeltype": "CA"}, {"alias": "xrd.ybase.readback", "channel": "SARES21-XRD:MOT_TY.RBV", "channeltype": "CA"}, {"alias": "xrd.ybase.user_offset", "channel": "SARES21-XRD:MOT_TY.OFF", "channeltype": "CA"}, {"alias": "xrd.rxbase.readback", "channel": "SARES21-XRD:MOT_RX.RBV", "channeltype": "CA"}, {"alias": "xrd.rxbase.user_offset", "channel": "SARES21-XRD:MOT_RX.OFF", "channeltype": "CA"}, {"alias": "xrd.omega.readback", "channel": "SARES21-XRD:MOT_MY_RYTH.RBV", "channeltype": "CA"}, {"alias": "xrd.omega.user_offset", "channel": "SARES21-XRD:MOT_MY_RYTH.OFF", "channeltype": "CA"}, {"alias": "xrd.gamma.readback", "channel": "SARES21-XRD:MOT_NY_RY2TH.RBV", "channeltype": "CA"}, {"alias": "xrd.gamma.user_offset", "channel": "SARES21-XRD:MOT_NY_RY2TH.OFF", "channeltype": "CA"}, {"alias": "xrd.delta.readback", "channel": "SARES21-XRD:MOT_DT_RX2TH.RBV", "channeltype": "CA"}, {"alias": "xrd.delta.user_offset", "channel": "SARES21-XRD:MOT_DT_RX2TH.OFF", "channeltype": "CA"}, {"alias": "xrd.tdet.readback", "channel": "SARES21-XRD:MOT_D_T.RBV", "channeltype": "CA"}, {"alias": "xrd.tdet.user_offset", "channel": "SARES21-XRD:MOT_D_T.OFF", "channeltype": "CA"}, {"alias": "xrd.tpol.readback", "channel": "SARES21-XRD:MOT_P_T.RBV", "channeltype": "CA"}, {"alias": "xrd.tpol.user_offset", "channel": "SARES21-XRD:MOT_P_T.OFF", "channeltype": "CA"}, {"alias": "xrd.xhl.readback", "channel": "SARES21-XRD:MOT_TBL_TX.RBV", "channeltype": "CA"}, {"alias": "xrd.xhl.user_offset", "channel": "SARES21-XRD:MOT_TBL_TX.OFF", "channeltype": "CA"}, {"alias": "xrd.zhl.readback", "channel": "SARES21-XRD:MOT_TBL_TZ.RBV", "channeltype": "CA"}, {"alias": "xrd.zhl.user_offset", "channel": "SARES21-XRD:MOT_TBL_TZ.OFF", "channeltype": "CA"}, {"alias": "xrd.yhl.readback", "channel": "SARES21-XRD:MOT_TBL_TY.RBV", "channeltype": "CA"}, {"alias": "xrd.yhl.user_offset", "channel": "SARES21-XRD:MOT_TBL_TY.OFF", "channeltype": "CA"}, {"alias": "xrd.rxhl.readback", "channel": "SARES21-XRD:MOT_TBL_RX.RBV", "channeltype": "CA"}, {"alias": "xrd.rxhl.user_offset", "channel": "SARES21-XRD:MOT_TBL_RX.OFF", "channeltype": "CA"}, {"alias": "xrd.teta.readback", "channel": "SARES21-XRD:MOT_HEX_TX.RBV", "channeltype": "CA"}, {"alias": "xrd.teta.user_offset", "channel": "SARES21-XRD:MOT_HEX_TX.OFF", "channeltype": "CA"}, {"alias": "xrd.eta.readback", "channel": "SARES21-XRD:MOT_HEX_RX.RBV", "channeltype": "CA"}, {"alias": "xrd.eta.user_offset", "channel": "SARES21-XRD:MOT_HEX_RX.OFF", "channeltype": "CA"}] +[{"alias": "xrd.xbase.readback", "channel": "SARES21-XRD:MOT_TX.RBV", "channeltype": "CA"}, {"alias": "xrd.xbase.user_offset", "channel": "SARES21-XRD:MOT_TX.OFF", "channeltype": "CA"}, {"alias": "xrd.ybase.readback", "channel": "SARES21-XRD:MOT_TY.RBV", "channeltype": "CA"}, {"alias": "xrd.ybase.user_offset", "channel": "SARES21-XRD:MOT_TY.OFF", "channeltype": "CA"}, {"alias": "xrd.rxbase.readback", "channel": "SARES21-XRD:MOT_RX.RBV", "channeltype": "CA"}, {"alias": "xrd.rxbase.user_offset", "channel": "SARES21-XRD:MOT_RX.OFF", "channeltype": "CA"}, {"alias": "xrd.omega.readback", "channel": "SARES21-XRD:MOT_MY_RYTH.RBV", "channeltype": "CA"}, {"alias": "xrd.omega.user_offset", "channel": "SARES21-XRD:MOT_MY_RYTH.OFF", "channeltype": "CA"}, {"alias": "xrd.gamma.readback", "channel": "SARES21-XRD:MOT_NY_RY2TH.RBV", "channeltype": "CA"}, {"alias": "xrd.gamma.user_offset", "channel": "SARES21-XRD:MOT_NY_RY2TH.OFF", "channeltype": "CA"}, {"alias": "xrd.delta.readback", "channel": "SARES21-XRD:MOT_DT_RX2TH.RBV", "channeltype": "CA"}, {"alias": "xrd.delta.user_offset", "channel": "SARES21-XRD:MOT_DT_RX2TH.OFF", "channeltype": "CA"}, {"alias": "xrd.tdet.readback", "channel": "SARES21-XRD:MOT_D_T.RBV", "channeltype": "CA"}, {"alias": "xrd.tdet.user_offset", "channel": "SARES21-XRD:MOT_D_T.OFF", "channeltype": "CA"}, {"alias": "xrd.tpol.readback", "channel": "SARES21-XRD:MOT_P_T.RBV", "channeltype": "CA"}, {"alias": "xrd.tpol.user_offset", "channel": "SARES21-XRD:MOT_P_T.OFF", "channeltype": "CA"}, {"alias": "xrd.xhl.readback", "channel": "SARES21-XRD:MOT_TBL_TX.RBV", "channeltype": "CA"}, {"alias": "xrd.xhl.user_offset", "channel": "SARES21-XRD:MOT_TBL_TX.OFF", "channeltype": "CA"}, {"alias": "xrd.zhl.readback", "channel": "SARES21-XRD:MOT_TBL_TZ.RBV", "channeltype": "CA"}, {"alias": "xrd.zhl.user_offset", "channel": "SARES21-XRD:MOT_TBL_TZ.OFF", "channeltype": "CA"}, {"alias": "xrd.yhl.readback", "channel": "SARES21-XRD:MOT_TBL_TY.RBV", "channeltype": "CA"}, {"alias": "xrd.yhl.user_offset", "channel": "SARES21-XRD:MOT_TBL_TY.OFF", "channeltype": "CA"}, {"alias": "xrd.rxhl.readback", "channel": "SARES21-XRD:MOT_TBL_RX.RBV", "channeltype": "CA"}, {"alias": "xrd.rxhl.user_offset", "channel": "SARES21-XRD:MOT_TBL_RX.OFF", "channeltype": "CA"}, {"alias": "xrd.teta.readback", "channel": "SARES21-XRD:MOT_HEX_TX.RBV", "channeltype": "CA"}, {"alias": "xrd.teta.user_offset", "channel": "SARES21-XRD:MOT_HEX_TX.OFF", "channeltype": "CA"}, {"alias": "xrd.eta.readback", "channel": "SARES21-XRD:MOT_HEX_RX.RBV", "channeltype": "CA"}, {"alias": "xrd.eta.user_offset", "channel": "SARES21-XRD:MOT_HEX_RX.OFF", "channeltype": "CA"}, {"alias": "mirr1.x.readback", "channel": "SAROP21-OOMV092:W_X.RBV", "channeltype": "CA"}, {"alias": "mirr1.x.user_offset", "channel": "SAROP21-OOMV092:W_X.OFF", "channeltype": "CA"}, {"alias": "mirr1.y.readback", "channel": "SAROP21-OOMV092:W_Y.RBV", "channeltype": "CA"}, {"alias": "mirr1.y.user_offset", "channel": "SAROP21-OOMV092:W_Y.OFF", "channeltype": "CA"}, {"alias": "mirr1.rx.readback", "channel": "SAROP21-OOMV092:W_RX.RBV", "channeltype": "CA"}, {"alias": "mirr1.rx.user_offset", "channel": "SAROP21-OOMV092:W_RX.OFF", "channeltype": "CA"}, {"alias": "mirr1.rz.readback", "channel": "SAROP21-OOMV092:W_RZ.RBV", "channeltype": "CA"}, {"alias": "mirr1.rz.user_offset", "channel": "SAROP21-OOMV092:W_RZ.OFF", "channeltype": "CA"}, {"alias": "mirr2.x.readback", "channel": "SAROP21-OOMV096:W_X.RBV", "channeltype": "CA"}, {"alias": "mirr2.x.user_offset", "channel": "SAROP21-OOMV096:W_X.OFF", "channeltype": "CA"}, {"alias": "mirr2.y.readback", "channel": "SAROP21-OOMV096:W_Y.RBV", "channeltype": "CA"}, {"alias": "mirr2.y.user_offset", "channel": "SAROP21-OOMV096:W_Y.OFF", "channeltype": "CA"}, {"alias": "mirr2.rx.readback", "channel": "SAROP21-OOMV096:W_RX.RBV", "channeltype": "CA"}, {"alias": "mirr2.rx.user_offset", "channel": "SAROP21-OOMV096:W_RX.OFF", "channeltype": "CA"}, {"alias": "mirr2.rz.readback", "channel": "SAROP21-OOMV096:W_RZ.RBV", "channeltype": "CA"}, {"alias": "mirr2.rz.user_offset", "channel": "SAROP21-OOMV096:W_RZ.OFF", "channeltype": "CA"}, {"alias": "xp.x.readback", "channel": "SAROP21-OPPI103:MOTOR_X1.RBV", "channeltype": "CA"}, {"alias": "xp.x.user_offset", "channel": "SAROP21-OPPI103:MOTOR_X1.OFF", "channeltype": "CA"}, {"alias": "xp.y.readback", "channel": "SAROP21-OPPI103:MOTOR_Y1.RBV", "channeltype": "CA"}, {"alias": "xp.y.user_offset", "channel": "SAROP21-OPPI103:MOTOR_Y1.OFF", "channeltype": "CA"}, {"alias": "gps.xbase.readback", "channel": "SARES22-GPS:MOT_TX.RBV", "channeltype": "CA"}, {"alias": "gps.xbase.user_offset", "channel": "SARES22-GPS:MOT_TX.OFF", "channeltype": "CA"}, {"alias": "gps.ybase.readback", "channel": "SARES22-GPS:MOT_TY.RBV", "channeltype": "CA"}, {"alias": "gps.ybase.user_offset", "channel": "SARES22-GPS:MOT_TY.OFF", "channeltype": "CA"}, {"alias": "gps.rxbase.readback", "channel": "SARES22-GPS:MOT_RX.RBV", "channeltype": "CA"}, {"alias": "gps.rxbase.user_offset", "channel": "SARES22-GPS:MOT_RX.OFF", "channeltype": "CA"}, {"alias": "gps.omega.readback", "channel": "SARES22-GPS:MOT_MY_RYTH.RBV", "channeltype": "CA"}, {"alias": "gps.omega.user_offset", "channel": "SARES22-GPS:MOT_MY_RYTH.OFF", "channeltype": "CA"}, {"alias": "gps.gamma.readback", "channel": "SARES22-GPS:MOT_NY_RY2TH.RBV", "channeltype": "CA"}, {"alias": "gps.gamma.user_offset", "channel": "SARES22-GPS:MOT_NY_RY2TH.OFF", "channeltype": "CA"}, {"alias": "gps.xhl.readback", "channel": "SARES22-GPS:MOT_TBL_TX.RBV", "channeltype": "CA"}, {"alias": "gps.xhl.user_offset", "channel": "SARES22-GPS:MOT_TBL_TX.OFF", "channeltype": "CA"}, {"alias": "gps.zhl.readback", "channel": "SARES22-GPS:MOT_TBL_TZ.RBV", "channeltype": "CA"}, {"alias": "gps.zhl.user_offset", "channel": "SARES22-GPS:MOT_TBL_TZ.OFF", "channeltype": "CA"}, {"alias": "gps.yhl.readback", "channel": "SARES22-GPS:MOT_TBL_TY.RBV", "channeltype": "CA"}, {"alias": "gps.yhl.user_offset", "channel": "SARES22-GPS:MOT_TBL_TY.OFF", "channeltype": "CA"}, {"alias": "gps.rxhl.readback", "channel": "SARES22-GPS:MOT_TBL_RX.RBV", "channeltype": "CA"}, {"alias": "gps.rxhl.user_offset", "channel": "SARES22-GPS:MOT_TBL_RX.OFF", "channeltype": "CA"}, {"alias": "gps.rzhl.readback", "channel": "SARES22-GPS:MOT_TBL_RZ.RBV", "channeltype": "CA"}, {"alias": "gps.rzhl.user_offset", "channel": "SARES22-GPS:MOT_TBL_RZ.OFF", "channeltype": "CA"}, {"alias": "xeye.zoom.readback", "channel": "SARES20-EXP:MOT_NAV_Z.RBV", "channeltype": "CA"}, {"alias": "xeye.zoom.user_offset", "channel": "SARES20-EXP:MOT_NAV_Z.OFF", "channeltype": "CA"}, {"alias": "qioptic.zoom.readback", "channel": "SARES20-EXP:MOT_QIOPT_Z.RBV", "channeltype": "CA"}, {"alias": "qioptic.zoom.user_offset", "channel": "SARES20-EXP:MOT_QIOPT_Z.OFF", "channeltype": "CA"}, {"alias": "qioptic.focus.readback", "channel": "SARES20-EXP:MOT_QIOPT_F.RBV", "channeltype": "CA"}, {"alias": "qioptic.focus.user_offset", "channel": "SARES20-EXP:MOT_QIOPT_F.OFF", "channeltype": "CA"}, {"alias": "las.wp.readback", "channel": "SLAAR21-LMOT-M534:MOT.RBV", "channeltype": "CA"}, {"alias": "las.wp.user_offset", "channel": "SLAAR21-LMOT-M534:MOT.OFF", "channeltype": "CA"}, {"alias": "las._eos_delay.readback", "channel": "SLAAR21-LMOT-M521:MOTOR_1.RBV", "channeltype": "CA"}, {"alias": "las._eos_delay.user_offset", "channel": "SLAAR21-LMOT-M521:MOTOR_1.OFF", "channeltype": "CA"}, {"alias": "las._thz_delaystg.readback", "channel": "SLAAR21-LMOT-M522:MOTOR_1.RBV", "channeltype": "CA"}, {"alias": "las._thz_delaystg.user_offset", "channel": "SLAAR21-LMOT-M522:MOTOR_1.OFF", "channeltype": "CA"}, {"alias": "las.compressor.readback", "channel": "SLAAR21-LMOT-M532:MOT.RBV", "channeltype": "CA"}, {"alias": "las.compressor.user_offset", "channel": "SLAAR21-LMOT-M532:MOT.OFF", "channeltype": "CA"}, {"alias": "las._lam_delay_smarstg.readback", "channel": "SLAAR21-LMTS-LAM11.MOTRBV", "channeltype": "CA"}, {"alias": "las._lam_delay_smarstg.homed", "channel": "SLAAR21-LMTS-LAM11.GET_HOMED", "channeltype": "CA"}, {"alias": "las._lam_delaystg.readback", "channel": "SLAAR21-LMOT-M548:MOT.RBV", "channeltype": "CA"}, {"alias": "las._lam_delaystg.user_offset", "channel": "SLAAR21-LMOT-M548:MOT.OFF", "channeltype": "CA"}, {"alias": "las._palm_delaystg.readback", "channel": "SLAAR21-LMOT-M552:MOT.RBV", "channeltype": "CA"}, {"alias": "las._palm_delaystg.user_offset", "channel": "SLAAR21-LMOT-M552:MOT.OFF", "channeltype": "CA"}, {"alias": "las.spatialenc_rot.readback", "channel": "SARES23-ESB18.MOTRBV", "channeltype": "CA"}, {"alias": "las.spatialenc_rot.homed", "channel": "SARES23-ESB18.GET_HOMED", "channeltype": "CA"}, {"alias": "las.pump_x.readback", "channel": "SARES23-ESB2.MOTRBV", "channeltype": "CA"}, {"alias": "las.pump_x.homed", "channel": "SARES23-ESB2.GET_HOMED", "channeltype": "CA"}, {"alias": "las.pump_gonio.readback", "channel": "SARES23-ESB1.MOTRBV", "channeltype": "CA"}, {"alias": "las.pump_gonio.homed", "channel": "SARES23-ESB1.GET_HOMED", "channeltype": "CA"}, {"alias": "las.pump_rot.readback", "channel": "SARES23-ESB16.MOTRBV", "channeltype": "CA"}, {"alias": "las.pump_rot.homed", "channel": "SARES23-ESB16.GET_HOMED", "channeltype": "CA"}, {"alias": "las.thz_gonio.readback", "channel": "SARES23-ESB5.MOTRBV", "channeltype": "CA"}, {"alias": "las.thz_gonio.homed", "channel": "SARES23-ESB5.GET_HOMED", "channeltype": "CA"}, {"alias": "las.tar_focus.readback", "channel": "SARES23-ESB4.MOTRBV", "channeltype": "CA"}, {"alias": "las.tar_focus.homed", "channel": "SARES23-ESB4.GET_HOMED", "channeltype": "CA"}, {"alias": "las.spatialenc_gon.readback", "channel": "SARES23-ESB6.MOTRBV", "channeltype": "CA"}, {"alias": "las.spatialenc_gon.homed", "channel": "SARES23-ESB6.GET_HOMED", "channeltype": "CA"}, {"alias": "las.par_z.readback", "channel": "SARES23-ESB3.MOTRBV", "channeltype": "CA"}, {"alias": "las.par_z.homed", "channel": "SARES23-ESB3.GET_HOMED", "channeltype": "CA"}, {"alias": "las.tar_y.readback", "channel": "SARES20-EXP:MOT_VT80.RBV", "channeltype": "CA"}, {"alias": "las.tar_y.user_offset", "channel": "SARES20-EXP:MOT_VT80.OFF", "channeltype": "CA"}, {"alias": "las.tar_transl.readback", "channel": "SARES20-EXP:MOT_TX.RBV", "channeltype": "CA"}, {"alias": "las.tar_transl.user_offset", "channel": "SARES20-EXP:MOT_TX.OFF", "channeltype": "CA"}] \ No newline at end of file diff --git a/eco/bernina/config.py b/eco/bernina/config.py index f8a68e5..60af94e 100755 --- a/eco/bernina/config.py +++ b/eco/bernina/config.py @@ -322,7 +322,7 @@ components = [ "type": "eco.acquisition.dia:DIAClient", "kwargs": { "instrument": "bernina", - "api_address": "http://sf-daq-swissmx:10000", + "api_address": "http://sf-daq-bernina:10000", "pgroup": config.pgroup, 'pedestal_directory':config.jf_pedestal_directory, "gain_path": config.jf_gain_path, @@ -360,6 +360,8 @@ components = [ ] + +#### OLD STUFF TO BE TRANSFERRED OR DELETED #### components_old = { "SARFE10-OPSH044": { "alias": "ShutUnd", diff --git a/eco/devices_general/detectors.py b/eco/devices_general/detectors.py index fb78266..0de3230 100755 --- a/eco/devices_general/detectors.py +++ b/eco/devices_general/detectors.py @@ -3,9 +3,9 @@ from epics import caget from epics import PV from ..eco_epics.utilities_epics import EnumWrapper -from cam_server import PipelineClient -from cam_server.utils import get_host_port_from_stream_address -from bsread import source, SUB +# from cam_server import PipelineClient +# from cam_server.utils import get_host_port_from_stream_address +# from bsread import source, SUB import subprocess import h5py from time import sleep diff --git a/eco/loptics/bernina_experiment.py b/eco/loptics/bernina_experiment.py index 167fdd3..936939a 100755 --- a/eco/loptics/bernina_experiment.py +++ b/eco/loptics/bernina_experiment.py @@ -31,27 +31,43 @@ class Laser_Exp: self.alias = Alias(name) # Waveplate and Delay stage - addMotorRecordToSelf(self, self.Id + "-M534:MOT", name="wp") try: - addMotorRecordToSelf(self, Id=self.Id + "-M521:MOTOR_1", name="_eos_delay") + addMotorRecordToSelf(self, self.Id + "-M534:MOT", name="wp_bright_field") + addMotorRecordToSelf(self, self.Id + "-M533:MOT", name="wp") + except: + print('No wp found') + + try: + addMotorRecordToSelf(self, Id=self.Id + "-M521:MOTOR_1", name="_spatialenc_df_delaystg") addDelayStageToSelf( - self, stage=self.__dict__["_eos_delay"], name="eos_delay" + self, stage=self.__dict__["_spatialenc_df_delaystg"], name="spatialenc_df_delay" ) except: print("No eos delay stage") pass try: addMotorRecordToSelf( - self, Id=self.Id + "-M522:MOTOR_1", name="_thz_delaystg" + self, Id=self.Id + "-M522:MOTOR_1", name="_spatialenc_bf_delaystg" ) addDelayStageToSelf( - self, self.__dict__["_thz_delaystg"], name="spatialenc_delay" + self, self.__dict__["_spatialenc_bf_delaystg"], name="spatialenc_bf_delay" ) # addDelayStageToSelf(self,self.__dict__["_thz_delaystg"], name="thz_delay") except: print("No thz delay stage") pass + try: + addMotorRecordToSelf( + self, Id=self.Id + "-M553:MOT", name="_spatialenc_both_delaystg" + ) + addDelayStageToSelf( + self, self.__dict__["_spatialenc_both_delaystg"], name="spatialenc_both_delay" + ) + # addDelayStageToSelf(self,self.__dict__["_thz_delaystg"], name="thz_delay") + except: + print("No thz delay stage") + pass # compressor addMotorRecordToSelf(self, Id=self.Id + "-M532:MOT", name="compressor") # self.compressor = MotorRecord(Id+'-M532:MOT') @@ -82,7 +98,7 @@ class Laser_Exp: # SmarAct ID ### Mirrors used in the experiment ### try: - addSmarActRecordToSelf(self, Id=self.IdSA + "-ESB18", name="spatialenc_rot") + addSmarActRecordToSelf(self, Id=self.IdSA + "-ESB18", name="spatialenc_bf_rot") # self._eos_rot = SmarActRecord(self.IdSA+'-ESB18') # self.eos_rot = User_to_motor(self._eos_rot,180./35.7,0.) except: @@ -122,13 +138,13 @@ class Laser_Exp: pass try: - addSmarActRecordToSelf(self, Id=self.IdSA + "-ESB6", name="spatialenc_gon") + addSmarActRecordToSelf(self, Id=self.IdSA + "-ESB6", name="spatialenc_bf_gon") # self.par_x = SmarActRecord(self.IdSA+'-ESB6') except: print("No Smaract ParX") pass try: - addSmarActRecordToSelf(self, Id=self.IdSA + "-ESB3", name="par_z") + addSmarActRecordToSelf(self, Id=self.IdSA + "-ESB3", name="spatialenc_df_lens") except: print("No Smaract ParZ") pass