tligui_y/slic
0
0
Fork 0
forked from slic/slic
Code Pull Requests Actions Wiki Activity

removed all add*ToSelf

Browse Source
This commit is contained in:
augustin_s
2022-07-07 19:16:31 +02:00
parent 7364def3ef
commit 48525fc16d
5 changed files with 70 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slic/devices/endstations/bernina_diffractometers.py
+27 -35
View File
@@ -3,14 +3,6 @@ from slic.core.adjustable import PVAdjustable
from slic.utils.deprecated.aliases import Alias, append_object_to_object
def addMotorToSelf(self, name=None, ID=None):
try:
self.__dict__[name] = Motor(ID, name=name)
self.alias.append(self.__dict__[name].alias)
except:
print(f"Warning! Could not find motor {name} (ID: {ID})")
class GPS:
def __init__(self, name=None, ID=None, configuration=["base"], alias_namespace=None):
@@ -21,18 +13,18 @@ class GPS:
if "base" in self.configuration:
### motors base platform ###
addMotorToSelf(self, ID=ID + ":MOT_TX", name="xbase")
addMotorToSelf(self, ID=ID + ":MOT_TY", name="ybase")
addMotorToSelf(self, ID=ID + ":MOT_RX", name="rxbase")
addMotorToSelf(self, ID=ID + ":MOT_MY_RYTH", name="alpha")
append_object_to_object(self, Motor, ID + ":MOT_TX", name="xbase")
append_object_to_object(self, Motor, ID + ":MOT_TY", name="ybase")
append_object_to_object(self, Motor, ID + ":MOT_RX", name="rxbase")
append_object_to_object(self, Motor, ID + ":MOT_MY_RYTH", name="alpha")
### motors XRD detector arm ###
addMotorToSelf(self, ID=ID + ":MOT_NY_RY2TH", name="gamma")
append_object_to_object(self, Motor, ID + ":MOT_NY_RY2TH", name="gamma")
if "phi_table" in self.configuration:
### motors phi table ###
addMotorToSelf(self, ID=ID + ":MOT_HEX_RX", name="phi")
addMotorToSelf(self, ID=ID + ":MOT_HEX_TX", name="tphi")
append_object_to_object(self, Motor, ID + ":MOT_HEX_RX", name="phi")
append_object_to_object(self, Motor, ID + ":MOT_HEX_TX", name="tphi")
if "phi_hex" in self.configuration:
### motors PI hexapod ###
@@ -45,15 +37,15 @@ class GPS:
if "hlxz" in self.configuration:
### motors heavy load goniometer ###
addMotorToSelf(self, ID=ID + ":MOT_TBL_TX", name="xhl")
addMotorToSelf(self, ID=ID + ":MOT_TBL_TZ", name="zhl")
append_object_to_object(self, Motor, ID + ":MOT_TBL_TX", name="xhl")
append_object_to_object(self, Motor, ID + ":MOT_TBL_TZ", name="zhl")
if "hly" in self.configuration:
addMotorToSelf(self, ID=ID + ":MOT_TBL_TY", name="yhl")
append_object_to_object(self, Motor, ID + ":MOT_TBL_TY", name="yhl")
if "hlrxrz" in self.configuration:
addMotorToSelf(self, ID=ID + ":MOT_TBL_RX", name="rxhl")
addMotorToSelf(self, ID=ID + ":MOT_TBL_RZ", name="rzhl")
append_object_to_object(self, Motor, ID + ":MOT_TBL_RX", name="rxhl")
append_object_to_object(self, Motor, ID + ":MOT_TBL_RZ", name="rzhl")
def get_adjustable_positions_str(self):
ostr = "*****GPS motor positions******\n"
@@ -82,45 +74,45 @@ class XRD:
if "base" in self.configuration:
### motors base platform ###
### motors base platform ###
addMotorToSelf(self, ID=ID + ":MOT_TX", name="xbase")
addMotorToSelf(self, ID=ID + ":MOT_TY", name="ybase")
addMotorToSelf(self, ID=ID + ":MOT_RX", name="rxbase")
addMotorToSelf(self, ID=ID + ":MOT_MY_RYTH", name="alpha")
append_object_to_object(self, Motor, ID + ":MOT_TX", name="xbase")
append_object_to_object(self, Motor, ID + ":MOT_TY", name="ybase")
append_object_to_object(self, Motor, ID + ":MOT_RX", name="rxbase")
append_object_to_object(self, Motor, ID + ":MOT_MY_RYTH", name="alpha")
if "arm" in self.configuration:
### motors XRD detector arm ###
addMotorToSelf(self, ID=ID + ":MOT_NY_RY2TH", name="gamma")
addMotorToSelf(self, ID=ID + ":MOT_DT_RX2TH", name="delta")
append_object_to_object(self, Motor, ID + ":MOT_NY_RY2TH", name="gamma")
append_object_to_object(self, Motor, ID + ":MOT_DT_RX2TH", name="delta")
### motors XRD area detector branch ###
addMotorToSelf(self, ID=ID + ":MOT_D_T", name="tdet")
append_object_to_object(self, Motor, ID + ":MOT_D_T", name="tdet")
### motors XRD polarisation analyzer branch ###
addMotorToSelf(self, ID=ID + ":MOT_P_T", name="tpol")
append_object_to_object(self, Motor, ID + ":MOT_P_T", name="tpol")
# missing: slits of flight tube
if "hlxz" in self.configuration:
### motors heavy load goniometer ###
addMotorToSelf(self, ID=ID + ":MOT_TBL_TX", name="xhl")
addMotorToSelf(self, ID=ID + ":MOT_TBL_TZ", name="zhl")
append_object_to_object(self, Motor, ID + ":MOT_TBL_TX", name="xhl")
append_object_to_object(self, Motor, ID + ":MOT_TBL_TZ", name="zhl")
if "hly" in self.configuration:
addMotorToSelf(self, ID=ID + ":MOT_TBL_TY", name="yhl")
append_object_to_object(self, Motor, ID + ":MOT_TBL_TY", name="yhl")
if "hlrxrz" in self.configuration:
try:
addMotorToSelf(self, ID=ID + ":MOT_TBL_RX", name="rxhl")
append_object_to_object(self, Motor, ID + ":MOT_TBL_RX", name="rxhl")
except:
print("XRD.rxhl not found")
pass
try:
addMotorToSelf(self, ID=ID + ":MOT_TBL_RY", name="rzhl")
append_object_to_object(self, Motor, ID + ":MOT_TBL_RY", name="rzhl")
except:
print("XRD.rzhl not found")
pass
if "phi_table" in self.configuration:
### motors nu table ###
addMotorToSelf(self, ID=ID + ":MOT_HEX_TX", name="tphi")
addMotorToSelf(self, ID=ID + ":MOT_HEX_RX", name="phi")
append_object_to_object(self, Motor, ID + ":MOT_HEX_TX", name="tphi")
append_object_to_object(self, Motor, ID + ":MOT_HEX_RX", name="phi")
if "phi_hex" in self.configuration:
### motors PI hexapod ###
slic/devices/general/micos_stage.py
+2 -14
View File
@@ -2,25 +2,13 @@ from slic.devices.general.motor import Motor
from slic.utils.deprecated.aliases import Alias, append_object_to_object
def addMotorToSelf(self, name=None, ID=None):
try:
self.__dict__[name] = Motor(ID, name=name)
self.alias.append(self.__dict__[name].alias)
except:
print(f"Warning! Could not find motor {name} (ID: {ID})")
self.ID = ID
self.name = name
self.alias = Alias(name)
class stage:
def __init__(self, name=None, vonHamos_horiz_pv=None, vonHamos_vert_pv=None):
self.name = name
self.alias = Alias(name)
addMotorToSelf(self, ID=vonHamos_horiz_pv, name="horiz")
addMotorToSelf(self, ID=vonHamos_vert_pv, name="vert")
append_object_to_object(self, Motor, vonHamos_horiz_pv, name="horiz")
append_object_to_object(self, Motor, vonHamos_vert_pv, name="vert")
def get_adjustable_positions_str(self):
ostr = "***** VonHamos motor positions******\n"
slic/devices/loptics/bernina_experiment.py
+36 -51
View File
@@ -1,4 +1,4 @@
from slic.utils.deprecated.aliases import Alias
from slic.utils.deprecated.aliases import Alias, append_object_to_object
from slic.devices.general.motor import Motor
from ..general.smaract import SmarActAxis
from ..general.delay_stage import DelayStage
@@ -10,21 +10,6 @@ from pint import UnitRegistry
ureg = UnitRegistry()
def addMotorToSelf(self, ID=None, name=None):
self.__dict__[name] = Motor(ID, name=name)
self.alias.append(self.__dict__[name].alias)
def addSmarActAxisToSelf(self, ID=None, name=None):
self.__dict__[name] = SmarActAxis(ID, name=name)
self.alias.append(self.__dict__[name].alias)
def addDelayStageToSelf(self, stage=None, name=None):
self.__dict__[name] = DelayStage(stage, name=name)
self.alias.append(self.__dict__[name].alias)
class DelayTime(AdjustableVirtual):
def __init__(self, stage, direction=1, passes=2, reset_current_value_to=True, name=None):
@@ -107,20 +92,20 @@ class Laser_Exp:
# Waveplate and Delay stage
try:
addMotorToSelf(self, self.ID + "-M534:MOT", name="pump_wp")
addMotorToSelf(self, self.ID + "-M533:MOT", name="tt_wp")
append_object_to_object(self, Motor, self.ID + "-M534:MOT", name="pump_wp")
append_object_to_object(self, Motor, self.ID + "-M533:MOT", name="tt_wp")
except:
print("No wp found")
try:
addMotorToSelf(self, ID=self.ID + "-M521:MOTOR_1", name="_pump_delaystg")
addDelayStageToSelf(self, stage=self.__dict__["_pump_delaystg"], name="pump_delay")
append_object_to_object(self, Motor, self.ID + "-M521:MOTOR_1", name="_pump_delaystg")
append_object_to_object(self, DelayStage, self.__dict__["_pump_delaystg"], name="pump_delay")
except Exception as expt:
print("No eos delay stage")
print(expt)
# try:
addMotorToSelf(self, ID=self.ID + "-M521:MOTOR_1", name="delay_eos_stg")
append_object_to_object(self, Motor, self.ID + "-M521:MOTOR_1", name="delay_eos_stg")
self.delay_eos = DelayTime(self.delay_eos_stg, name="delay_eos")
self.alias.append(self.delay_eos.alias)
self.lxt_eos = DelayTime(self.delay_eos_stg, direction=-1, name="lxt_eos")
@@ -130,13 +115,13 @@ class Laser_Exp:
# print(expt)
try:
addMotorToSelf(self, ID=self.ID + "-M522:MOTOR_1", name="delay_tt_stg")
append_object_to_object(self, Motor, self.ID + "-M522:MOTOR_1", name="delay_tt_stg")
self.delay_tt = DelayTime(self.delay_tt_stg, name="delay_tt")
self.alias.append(self.delay_tt.alias)
except:
print("Problems initializing global delay stage")
try:
addMotorToSelf(self, ID=self.ID + "-M523:MOTOR_1", name="delay_glob_stg")
append_object_to_object(self, Motor, self.ID + "-M523:MOTOR_1", name="delay_glob_stg")
self.delay_glob = DelayTime(self.delay_glob_stg, name="delay_glob")
self.alias.append(self.delay_glob.alias)
self.lxt_glob = DelayTime(self.delay_glob_stg, direction=-1, name="lxt_glob")
@@ -151,23 +136,23 @@ class Laser_Exp:
except:
print("Problems initializing virtual pump delay stage")
# compressor
addMotorToSelf(self, ID=self.ID + "-M532:MOT", name="compressor")
append_object_to_object(self, Motor, self.ID + "-M532:MOT", name="compressor")
# self.compressor = Motor(ID + '-M532:MOT')
# LAM delay stages
addSmarActAxisToSelf(self, ID="SLAAR21-LMTS-LAM11", name="_lam_delay_smarstg")
addDelayStageToSelf(self, self.__dict__["_lam_delay_smarstg"], name="lam_delay_smar")
append_object_to_object(self, SmarActAxis, "SLAAR21-LMTS-LAM11", name="_lam_delay_smarstg")
append_object_to_object(self, DelayStage, self.__dict__["_lam_delay_smarstg"], name="lam_delay_smar")
# self._lam_delayStg_Smar = SmarActAxis('SLAAR21-LMTS-LAM11')
# self.lam_delay_Smar = DelayStage(self._lam_delayStg_Smar)
addMotorToSelf(self, ID=self.ID + "-M548:MOT", name="_lam_delaystg")
addDelayStageToSelf(self, self.__dict__["_lam_delaystg"], name="lam_delay")
append_object_to_object(self, Motor, self.ID + "-M548:MOT", name="_lam_delaystg")
append_object_to_object(self, DelayStage, self.__dict__["_lam_delaystg"], name="lam_delay")
# self._lam_delayStg = Motor(self.ID + '-M548:MOT')
# self.lam_delay = DelayStage(self._lam_delayStg)
# PALM delay stages
addMotorToSelf(self, ID=self.ID + "-M552:MOT", name="_palm_delaystg")
addDelayStageToSelf(self, self.__dict__["_palm_delaystg"], name="palm_delay")
append_object_to_object(self, Motor, self.ID + "-M552:MOT", name="_palm_delaystg")
append_object_to_object(self, DelayStage, self.__dict__["_palm_delaystg"], name="palm_delay")
# self._palm_delayStg = Motor(self.ID + '-M552:MOT')
# self.palm_delay = DelayStage(self._palm_delayStg)
@@ -175,8 +160,8 @@ class Laser_Exp:
# self._psen_delayStg = Motor(self.ID + '')
# self.psen_delay = DelayStage(self._pump_delayStg)
try:
addMotorToSelf(self, ID=self.ID + "-M561:MOT", name="_psen_delaystg")
addDelayStageToSelf(self, stage=self.__dict__["_psen_delaystg"], name="psen_delay")
append_object_to_object(self, Motor, self.ID + "-M561:MOT", name="_psen_delaystg")
append_object_to_object(self, DelayStage, self.__dict__["_psen_delaystg"], name="psen_delay")
except Exception as expt:
print("No psen delay stage")
print(expt)
@@ -186,7 +171,7 @@ class Laser_Exp:
for smar_name, smar_address in self.smar_config.items():
try:
addSmarActAxisToSelf(self, ID=(self.ID_SA + smar_address), name=smar_name)
append_object_to_object(self, SmarActAxis, self.ID_SA + smar_address, name=smar_name)
except:
print("Loading %s SmarAct motor in bernina laser conifg failed") % (smar_name)
@@ -221,50 +206,50 @@ class Laser_Exp_old:
# Waveplate and Delay stage
try:
addMotorToSelf(self, self.ID + "-M534:MOT", name="pump_wp")
addMotorToSelf(self, self.ID + "-M533:MOT", name="tt_wp")
append_object_to_object(self, Motor, self.ID + "-M534:MOT", name="pump_wp")
append_object_to_object(self, Motor, self.ID + "-M533:MOT", name="tt_wp")
except:
print("No wp found")
try:
addMotorToSelf(self, ID=self.ID + "-M521:MOTOR_1", name="_pump_delaystg")
addDelayStageToSelf(self, stage=self.__dict__["_pump_delaystg"], name="pump_delay")
append_object_to_object(self, Motor, self.ID + "-M521:MOTOR_1", name="_pump_delaystg")
append_object_to_object(self, DelayStage, self.__dict__["_pump_delaystg"], name="pump_delay")
except:
print("No eos delay stage")
pass
try:
addMotorToSelf(self, ID=self.ID + "-M522:MOTOR_1", name="_tt_delaystg")
addDelayStageToSelf(self, self.__dict__["_tt_delaystg"], name="tt_delay")
# addDelayStageToSelf(self,self.__dict__["_thz_delaystg"], name="thz_delay")
append_object_to_object(self, Motor, self.ID + "-M522:MOTOR_1", name="_tt_delaystg")
append_object_to_object(self, DelayStage, self.__dict__["_tt_delaystg"], name="tt_delay")
# append_object_to_object(self, DelayStage, self.__dict__["_thz_delaystg"], name="thz_delay")
except:
print("No thz delay stage")
pass
try:
addMotorToSelf(self, ID=self.ID + "-M553:MOT", name="_exp_delaystg")
addDelayStageToSelf(self, self.__dict__["_exp_delaystg"], name="exp_delay")
# addDelayStageToSelf(self,self.__dict__["_thz_delaystg"], name="thz_delay")
append_object_to_object(self, Motor, self.ID + "-M553:MOT", name="_exp_delaystg")
append_object_to_object(self, DelayStage, self.__dict__["_exp_delaystg"], name="exp_delay")
# append_object_to_object(self, DelayStage, self.__dict__["_thz_delaystg"], name="thz_delay")
except:
print("No thz delay stage")
pass
# compressor
addMotorToSelf(self, ID=self.ID + "-M532:MOT", name="compressor")
append_object_to_object(self, Motor, self.ID + "-M532:MOT", name="compressor")
# self.compressor = Motor(ID + '-M532:MOT')
# LAM delay stages
addSmarActAxisToSelf(self, ID="SLAAR21-LMTS-LAM11", name="_lam_delay_smarstg")
addDelayStageToSelf(self, self.__dict__["_lam_delay_smarstg"], name="lam_delay_smar")
append_object_to_object(self, SmarActAxis, "SLAAR21-LMTS-LAM11", name="_lam_delay_smarstg")
append_object_to_object(self, DelayStage, self.__dict__["_lam_delay_smarstg"], name="lam_delay_smar")
# self._lam_delayStg_Smar = SmarActAxis('SLAAR21-LMTS-LAM11')
# self.lam_delay_Smar = DelayStage(self._lam_delayStg_Smar)
addMotorToSelf(self, ID=self.ID + "-M548:MOT", name="_lam_delaystg")
addDelayStageToSelf(self, self.__dict__["_lam_delaystg"], name="lam_delay")
append_object_to_object(self, Motor, self.ID + "-M548:MOT", name="_lam_delaystg")
append_object_to_object(self, DelayStage, self.__dict__["_lam_delaystg"], name="lam_delay")
# self._lam_delayStg = Motor(self.ID + '-M548:MOT')
# self.lam_delay = DelayStage(self._lam_delayStg)
# PALM delay stages
addMotorToSelf(self, ID=self.ID + "-M552:MOT", name="_palm_delaystg")
addDelayStageToSelf(self, self.__dict__["_palm_delaystg"], name="palm_delay")
append_object_to_object(self, Motor, self.ID + "-M552:MOT", name="_palm_delaystg")
append_object_to_object(self, DelayStage, self.__dict__["_palm_delaystg"], name="palm_delay")
# self._palm_delayStg = Motor(self.ID + '-M552:MOT')
# self.palm_delay = DelayStage(self._palm_delayStg)
@@ -277,7 +262,7 @@ class Laser_Exp_old:
for smar_name, smar_address in self.smar_config.items():
try:
addSmarActAxisToSelf(self, ID=(self.ID_SA + smar_address), name=smar_name)
append_object_to_object(self, SmarActAxis, self.ID_SA + smar_address, name=smar_name)
except:
print("Loading %s SmarAct motor in bernina laser conifg failed") % (smar_name)
slic/devices/xdiagnostics/profile_monitors_new.py
-5
View File
@@ -4,11 +4,6 @@ from slic.utils.deprecated.aliases import Alias, append_object_to_object
from slic.core.adjustable import PVEnumAdjustable
def addMotorToSelf(self, ID=None, name=None):
self.__dict__[name] = Motor(ID, name=name)
self.alias.append(self.__dict__[name].alias)
class Pprm:
def __init__(self, ID, name=None):
slic/devices/xoptics/offset_mirrors.py
+5 -13
View File
@@ -1,15 +1,7 @@
from slic.devices.general.motor import Motor
from slic.devices.general.motor import Motor, append_object_to_object
from slic.utils.deprecated.aliases import Alias
def addMotorToSelf(self, name=None, ID=None):
try:
self.__dict__[name] = Motor(ID, name=name)
self.alias.append(self.__dict__[name].alias)
except:
print(f"Warning! Could not find motor {name} (ID: {ID})")
class OffsetMirror:
def __init__(self, name=None, ID=None, alias_namespace=None):
@@ -17,10 +9,10 @@ class OffsetMirror:
self.name = name
self.alias = Alias(name)
addMotorToSelf(self, ID=ID + ":W_X", name="x")
addMotorToSelf(self, ID=ID + ":W_Y", name="y")
addMotorToSelf(self, ID=ID + ":W_RX", name="rx")
addMotorToSelf(self, ID=ID + ":W_RZ", name="rz")
append_object_to_object(self, Motor, ID + ":W_X", name="x")
append_object_to_object(self, Motor, ID + ":W_Y", name="y")
append_object_to_object(self, Motor, ID + ":W_RX", name="rx")
append_object_to_object(self, Motor, ID + ":W_RZ", name="rz")
def out(self):
pass