From e7508114fb0a82e7e70c5a67afdd59603bc27d16 Mon Sep 17 00:00:00 2001
From: NichtJens <nichtjens@gmail.com>
Date: Wed, 9 Dec 2020 11:14:48 +0100
Subject: [PATCH] moved coupled DCM to devices.py; cleaned up adhoc.py

---
 adhoc.py   | 46 ++++++++--------------------------------------
 devices.py |  7 ++++++-
 2 files changed, 14 insertions(+), 39 deletions(-)

diff --git a/adhoc.py b/adhoc.py
index f605a98..71336d3 100644
--- a/adhoc.py
+++ b/adhoc.py
@@ -1,17 +1,11 @@
+from types import SimpleNamespace
 
-class LXT:
-    pass
-
-lxt = LXT()
-
-
-from slic.devices.xoptics.dcm import CoupledDoubleCrystalMono
-
-monoFEL = CoupledDoubleCrystalMono("SAROP11-ODCM105")
-
-
+from slic.devices.device import Device
+from slic.devices.simpledevice import SimpleDevice
+from slic.devices.general.motor import Motor
 from slic.devices.general.smaract import SmarActAxis
 
+
 laser_pitch = SmarActAxis("SARES11-XICM125:ROX1")
 laser_trans = SmarActAxis("SARES11-XICM125:TRX1")
 laser_yaw = SmarActAxis("SARES11-XICM125:ROY1")
@@ -19,9 +13,6 @@ microscope_pitch = SmarActAxis("SARES11-XMI125:ROY1")
 microscope_yaw = SmarActAxis("SARES11-XMI125:ROZ1")
 
 
-#TODO: just some generic examples:
-from slic.devices.device import Device
-
 shut_und = Device(
     "SARFE10-OPSH044",
     description="Photon shutter after Undulator"
@@ -33,22 +24,12 @@ pbps_und = Device(
     description="Intensity position monitor after Undulator (PBPS)"
 )
 
-#print(shut_und)
-#print(pbps_und)
 
 
+class TXS(Device):
 
-from types import SimpleNamespace
-from slic.devices.basedevice import BaseDevice
-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"
+    def __init__(self, Id="SAROP11-PTXS128", name="TXS"):
+        super().__init__(Id, name=name)
 
         self.x = Motor(Id + ":TRX1")
         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)
-
-
 
 
 
diff --git a/devices.py b/devices.py
index 23d3dc9..a00e107 100644
--- a/devices.py
+++ b/devices.py
@@ -140,7 +140,12 @@ attExp = sd.xoptics.attenuator_aramis.AttenuatorAramis(
 
 mono = sd.xoptics.dcm.DoubleCrystalMono(
     "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(