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

split diffractometers into gps and xrd

Browse Source
This commit is contained in:
augustin_s
2022-07-07 19:35:25 +02:00
parent aa6e557026
commit a7d074aee2
2 changed files with 63 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slic/devices/endstations/bernina_gps.py
+63
View File
@@ -0,0 +1,63 @@
from slic.devices.general.motor import Motor
from slic.core.adjustable import PVAdjustable
from slic.utils.deprecated.aliases import Alias, append_object_to_object
class GPS:
def __init__(self, name=None, ID=None, configuration=["base"], alias_namespace=None):
self.ID = ID
self.name = name
self.alias = Alias(name)
self.configuration = configuration
if "base" in self.configuration:
### motors base platform ###
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 ###
append_object_to_object(self, Motor, ID + ":MOT_NY_RY2TH", name="gamma")
if "phi_table" in self.configuration:
### motors phi table ###
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 ###
append_object_to_object(self, PVAdjustable, "SARES20-HEX_PI:SET-POSI-X", pvname_readback="SARES20-HEX_PI:POSI-X", name="xhex")
append_object_to_object(self, PVAdjustable, "SARES20-HEX_PI:SET-POSI-Y", pvname_readback="SARES20-HEX_PI:POSI-Y", name="yhex")
append_object_to_object(self, PVAdjustable, "SARES20-HEX_PI:SET-POSI-Z", pvname_readback="SARES20-HEX_PI:POSI-Z", name="zhex")
append_object_to_object(self, PVAdjustable, "SARES20-HEX_PI:SET-POSI-U", pvname_readback="SARES20-HEX_PI:POSI-U", name="uhex")
append_object_to_object(self, PVAdjustable, "SARES20-HEX_PI:SET-POSI-V", pvname_readback="SARES20-HEX_PI:POSI-V", name="vhex")
append_object_to_object(self, PVAdjustable, "SARES20-HEX_PI:SET-POSI-W", pvname_readback="SARES20-HEX_PI:POSI-W", name="whex")
if "hlxz" in self.configuration:
### motors heavy load goniometer ###
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:
append_object_to_object(self, Motor, ID + ":MOT_TBL_TY", name="yhl")
if "hlrxrz" in self.configuration:
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"
for tkey, item in self.__dict__.items():
if hasattr(item, "get_current_value"):
pos = item.get_current_value()
ostr += " " + tkey.ljust(17) + " : % 14g\n" % pos
return ostr
def __repr__(self):
return self.get_adjustable_positions_str()
slic/devices/endstations/bernina_diffractometers.py → slic/devices/endstations/bernina_xrd.py
-57
View File
@@ -3,63 +3,6 @@ from slic.core.adjustable import PVAdjustable
from slic.utils.deprecated.aliases import Alias, append_object_to_object
class GPS:
def __init__(self, name=None, ID=None, configuration=["base"], alias_namespace=None):
self.ID = ID
self.name = name
self.alias = Alias(name)
self.configuration = configuration
if "base" in self.configuration:
### motors base platform ###
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 ###
append_object_to_object(self, Motor, ID + ":MOT_NY_RY2TH", name="gamma")
if "phi_table" in self.configuration:
### motors phi table ###
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 ###
append_object_to_object(self, PVAdjustable, "SARES20-HEX_PI:SET-POSI-X", pvname_readback="SARES20-HEX_PI:POSI-X", name="xhex")
append_object_to_object(self, PVAdjustable, "SARES20-HEX_PI:SET-POSI-Y", pvname_readback="SARES20-HEX_PI:POSI-Y", name="yhex")
append_object_to_object(self, PVAdjustable, "SARES20-HEX_PI:SET-POSI-Z", pvname_readback="SARES20-HEX_PI:POSI-Z", name="zhex")
append_object_to_object(self, PVAdjustable, "SARES20-HEX_PI:SET-POSI-U", pvname_readback="SARES20-HEX_PI:POSI-U", name="uhex")
append_object_to_object(self, PVAdjustable, "SARES20-HEX_PI:SET-POSI-V", pvname_readback="SARES20-HEX_PI:POSI-V", name="vhex")
append_object_to_object(self, PVAdjustable, "SARES20-HEX_PI:SET-POSI-W", pvname_readback="SARES20-HEX_PI:POSI-W", name="whex")
if "hlxz" in self.configuration:
### motors heavy load goniometer ###
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:
append_object_to_object(self, Motor, ID + ":MOT_TBL_TY", name="yhl")
if "hlrxrz" in self.configuration:
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"
for tkey, item in self.__dict__.items():
if hasattr(item, "get_current_value"):
pos = item.get_current_value()
ostr += " " + tkey.ljust(17) + " : % 14g\n" % pos
return ostr
def __repr__(self):
return self.get_adjustable_positions_str()
class XRD:
def __init__(self, name=None, ID=None, configuration=["base"]):