slic/alvra
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved coupled DCM to devices.py; cleaned up adhoc.py

Browse Source
This commit is contained in:
NichtJens
2020-12-09 11:14:48 +01:00
parent e0b92db47f
commit e7508114fb
2 changed files with 14 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
adhoc.py
View File

@ -1,17 +1,11 @@
from types import SimpleNamespace
class LXT: from slic.devices.device import Device
pass from slic.devices.simpledevice import SimpleDevice
from slic.devices.general.motor import Motor
lxt = LXT()
from slic.devices.xoptics.dcm import CoupledDoubleCrystalMono
monoFEL = CoupledDoubleCrystalMono("SAROP11-ODCM105")
from slic.devices.general.smaract import SmarActAxis from slic.devices.general.smaract import SmarActAxis
laser_pitch = SmarActAxis("SARES11-XICM125:ROX1") laser_pitch = SmarActAxis("SARES11-XICM125:ROX1")
laser_trans = SmarActAxis("SARES11-XICM125:TRX1") laser_trans = SmarActAxis("SARES11-XICM125:TRX1")
laser_yaw = SmarActAxis("SARES11-XICM125:ROY1") laser_yaw = SmarActAxis("SARES11-XICM125:ROY1")
@ -19,9 +13,6 @@ microscope_pitch = SmarActAxis("SARES11-XMI125:ROY1")
microscope_yaw = SmarActAxis("SARES11-XMI125:ROZ1") microscope_yaw = SmarActAxis("SARES11-XMI125:ROZ1")
#TODO: just some generic examples:
from slic.devices.device import Device
shut_und = Device( shut_und = Device(
"SARFE10-OPSH044", "SARFE10-OPSH044",
description="Photon shutter after Undulator" description="Photon shutter after Undulator"
@ -33,22 +24,12 @@ pbps_und = Device(
description="Intensity position monitor after Undulator (PBPS)" description="Intensity position monitor after Undulator (PBPS)"
) )
#print(shut_und)
#print(pbps_und)
class TXS(Device):
from types import SimpleNamespace def __init__(self, Id="SAROP11-PTXS128", name="TXS"):
from slic.devices.basedevice import BaseDevice super().__init__(Id, name=name)
from slic.devices.general.motor import Motor
from slic.devices.general.smaract import SmarActAxis
from slic.utils.printing import printable_dict
class TXS(BaseDevice):
def __init__(self):
self.Id = Id = "SAROP11-PTXS128"
self.x = Motor(Id + ":TRX1") self.x = Motor(Id + ":TRX1")
self.y = Motor(Id + ":TRY1") self.y = Motor(Id + ":TRY1")
@ -72,17 +53,6 @@ class TXS(BaseDevice):
) )
def __repr__(self):
to_print = {}
for key, item in self.__dict__.items():
if not isinstance(item, Motor):
continue
to_print[key] = str(item)
head = "TXS"
return printable_dict(to_print, head)

7
devices.py
View File

@ -140,7 +140,12 @@ attExp = sd.xoptics.attenuator_aramis.AttenuatorAramis(
mono = sd.xoptics.dcm.DoubleCrystalMono( mono = sd.xoptics.dcm.DoubleCrystalMono(
"SAROP11-ODCM105", "SAROP11-ODCM105",
description="Alvra DCM Monochromator" description="Alvra DCM"
)
monoFEL = sd.xoptics.dcm.CoupledDoubleCrystalMono(
"SAROP11-ARAMIS",
description="Alvra DCM coupled to FEL energy"
) )
refLaser = sd.xoptics.reflaser.RefLaser_Aramis( refLaser = sd.xoptics.reflaser.RefLaser_Aramis(