From 9e60cbefae0058d810ee7ee6e6d166f1d4e51b5e Mon Sep 17 00:00:00 2001
From: Sven Augustin <sven.augustin@psi.ch>
Date: Wed, 6 Jul 2022 18:19:17 +0200
Subject: [PATCH] added X-ray shutter and pulse picker; updated laser shutter;
 updated smaract stage names to new scheme; added TalbotGratings and
 signalMirror; switched from pbpsOpt to pbpsAtt

---
 devices.py | 57 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/devices.py b/devices.py
index 2c8dbad..a47d2de 100644
--- a/devices.py
+++ b/devices.py
@@ -1,6 +1,11 @@
 import slic.devices as sd
 
 
+shutter = sd.general.shutter.Shutter("SARFE10-OPSH059")
+
+pp = sd.xoptics.pulsepicker.PulsePicker("SAROP11-OPPI112", "SGE-CPCW-71-EVR0:FrontUnivOut15")
+
+
 phaseShifter = sd.timing.lasertiming.PhaseShifterAramis(
     "SLAAR01-TSPL-EPL",
     "/sf/alvra/config/lasertiming",
@@ -15,16 +20,16 @@ flexTable = sd.endstations.alvra_flex.table(
 )
 
 prism = sd.general.smaract.SmarActStage(
-    gonio="SARES11-CMOV-SMA691110",
-    trans="SARES11-CMOV-SMA691111",
-    rotat="SARES11-CMOV-SMA691112",
+    gonio="SARES11-XICM125:ROX1",
+    trans="SARES11-XICM125:TRX1",
+    rotat="SARES11-XICM125:ROY1",
 #    z_undulator=127,
     name="Prime laser prism"
 )
 
 xmic = sd.general.smaract.SmarActStage(
-    gonio="SARES11-CMOV-SMA691113",
-    rotat="SARES11-CMOV-SMA691114",
+    gonio="SARES11-XMI125:ROY1",
+    rotat="SARES11-XMI125:ROZ1",
 #    z_undulator=127,
     name="Prime microscope mirror"
 )
@@ -41,6 +46,20 @@ flexSample = sd.endstations.alvra_prime.Huber(
     name="Flex Sample Manipulator"
 )
 
+TalbotGratings = sd.general.smaract.SmarActStage(
+    linear_x="SARES11-XUSR125:SA_MOT1",
+    linear_y="SARES11-XUSR125:SA_MOT2",
+    linear_z="SARES11-XUSR125:SA_MOT3",
+    rotation="SARES11-XUSR125:SA_MOT4",
+    name="Talbot Gratings"
+)
+
+signalMirror = sd.general.smaract.SmarActStage(
+    linear="SARES11-XUSR125:SA_MOT5",
+    rotation="SARES11-XUSR125:SA_MOT6",
+    name="Signal Mirror"
+)
+
 #primeMicroscope = sd.endstations.alvra_prime.Microscope(
 #    "SARES11-XMI125",
 #    gonio="SARES11-CMOV-SMA691113",
@@ -69,26 +88,24 @@ primeCryTrans = sd.endstations.alvra_prime.VonHamosBragg(
 
 laser = sd.loptics.alvra_experiment.LaserExp()
 
-laserShutter = sd.loptics.alvra_laser_shutter.laser_shutter(
-    "SLAAR11-LDIO-LAS6891",
-    z_undulator=122,
-    description="Laser Shutter"
+laserShutter = sd.loptics.lasershutter.LaserShutter(
+    "SLAAR11-LDIO-LAS6891:SET_BO02"
 )
 
-pbpsOpt = sd.xdiagnostics.intensity_monitors.SolidTargetDetectorPBPS(
-    "SAROP11-PBPS117",
-    VME_crate="SAROP11-CVME-PBPS2", # please check this!
-    link=9,
-    description="Intensity/position monitor after Optics hutch (PBPS)"
-)
-
-#pbpsAtt = sd.xdiagnostics.intensity_monitors.SolidTargetDetectorPBPS(
-#    "SAROP11-PBPS122",
-#    VME_crate="SAROP11-CVME-PBPS1",
+#pbpsOpt = sd.xdiagnostics.intensity_monitors.SolidTargetDetectorPBPS(
+#    "SAROP11-PBPS117",
+#    VME_crate="SAROP11-CVME-PBPS2", # please check this!
 #    link=9,
-#    description="Intensity/Position monitor after Attenuator"
+#    description="Intensity/position monitor after Optics hutch (PBPS)"
 #)
 
+pbpsAtt = sd.xdiagnostics.intensity_monitors.SolidTargetDetectorPBPS(
+    "SAROP11-PBPS122",
+    VME_crate="SAROP11-CVME-PBPS1",
+    link=9,
+    description="Intensity/Position monitor after Attenuator"
+)
+
 screenFE = sd.xdiagnostics.profile_monitors.Pprm(
     "SARFE10-PPRM053",
     description="Profile monitor after single-shot spectrometer (PPRM)"