pre-cleanup

devices.py

@@ -31,18 +31,24 @@ xmic = sd.general.smaract.SmarActStage(
 
 primeSample = sd.endstations.alvra_prime.Huber(
     "SARES11-XSAM125",
-    z_undulator=127,
-    description="Sample XYZ manipulator"
+    z_undulator=125,
+    name="Prime Sample Manipulator"
 )
 
-primeMicroscope = sd.endstations.alvra_prime.Microscope(
-    "SARES11-XMI125",
-    gonio="SARES11-CMOV-SMA691113",
-    rotat="SARES11-CMOV-SMA691114",
-    z_undulator=127,
-    description="Microscope focus and zoom"
+flexSample = sd.endstations.alvra_prime.Huber(
+    "SARES12-XSAM128",
+    z_undulator=128,
+    name="Flex Sample Manipulator"
 )
 
+#primeMicroscope = sd.endstations.alvra_prime.Microscope(
+#    "SARES11-XMI125",
+#    gonio="SARES11-CMOV-SMA691113",
+#    rotat="SARES11-CMOV-SMA691114",
+#    z_undulator=127,
+#    description="Microscope focus and zoom"
+#)
+
 primeTable = sd.endstations.alvra_prime.Table(
     "SARES11-XOTA125",
     z_undulator=127,
@@ -123,10 +129,10 @@ kbHor = sd.xoptics.kbhor.KBhor(
     description="Alvra horizontal KB mirror"
 )
 
-kbVer = sd.xoptics.kbver.KBver(
-    "SAROP11-OKBV123",
-    description="Alvra vertical KB mirror"
-)
+#kbVer = sd.xoptics.kbver.KBver(
+#    "SAROP11-OKBV123",
+#    description="Alvra vertical KB mirror"
+#)
 
 attFE = sd.xoptics.attenuator_aramis.AttenuatorAramis(
     "SARFE10-OATT053",
@@ -158,10 +164,10 @@ slitSwitch = sd.xoptics.slits.SlitBlades_old(
     description="Slit in Optics hutch after Photon switchyard and before Alvra mono"
 )
 
-#slitUnd = sd.xoptics.slits.SlitFourBlades_old(
-#    "SARFE10-OAPU044",
-#    description="Slit after Undulator"
-#)
+slitUnd = sd.xoptics.slits.SlitFourBlades_old(
+    "SARFE10-OAPU044",
+    description="Slit after Undulator"
+)
 
 slitAttExp = sd.xoptics.slits.SlitPosWidth_old(
     "SAROP11-OAPU120",