added coupled mono+und

furka.py

@@ -15,6 +15,7 @@ from slic.utils import as_shortcut, Marker
 
 from undulator import Undulators
 from undulator import Mono
+from undulator import Coupled_MonoUnd
 
 dummy = DummyAdjustable(units="au")
 
@@ -27,10 +28,26 @@ retro = SimpleDevice("Retro Stages", x=mot_x, y=mot_y, z=mot_z, theta=mot_theta)
 
 #CH0 = PVAdjustable("SATES30-LSCP10-FNS:CH0:VAL_GET")
 
-und = Undulators(name="Undulators")
-#Mon = Mono("SATOP11-OSGM087")
 
-Mon = PVAdjustable("SATOP11-OSGM087:SetEnergy", pvname_done_moving="SATOP11-OSGM087:MOVING", name="MONO")
+n_und_ref = 6
+n_unds = [
+    6, 7, 8, 9, 10, 11, 12, 13, # 14 is the CHIC
+    15, 16, 17, 18, 19, 20, 21, 22
+]
+chic_fudge_offset = 0
+Mon2Unds_offset = 8.5
+
+und = Undulators(n_unds, n_und_ref, chic_fudge_offset, name="z Athos Undulators")
+#und = Undulators(name="Undulators")
+
+mono_name =  "Athos_mono"
+pv_mono_name="SATOP11-OSGM087" 
+
+Mon = Mono(pv_mono_name=pv_mono_name, mono_name=mono_name)
+MonUnd = Coupled_MonoUnd(n_unds, n_und_ref, chic_fudge_offset, unds_name="z Athos Undulators", pv_mono_name=pv_mono_name, mono_name=mono_name,  delta=Mon2Unds_offset, name = ("Mono+Und"))
+
+
+#Mon = PVAdjustable("SATOP11-OSGM087:SetEnergy", pvname_done_moving="SATOP11-OSGM087:MOVING", name="MONO")
 laser_delay = DelayStage("SLAAT31-LMOT-M808:MOT", name="Laser Delay")
 laser_WP = Motor("SLAAT31-LMOT-M801:MOT", name="Laser WavePlate")
 
@@ -41,7 +58,11 @@ channels = [
     "SATES30-LSCP10-FNS:CH0:VAL_GET",
     "SATES30-LSCP10-FNS:CH1:VAL_GET",
     "SATES30-LSCP10-FNS:CH4:VAL_GET",
-#    "SATES30-LSCP10-FNS:CH0:WFM"
+#    "SATES30-LSCP10-FNS:CH0:WFMi",
+    "SATES21-CAMS-PATT1:intensity",
+    "SATES21-CAMS-PATT1:x_profile",
+    "SATES21-CAMS-PATT1:y_profile",
+    "SATES21-CAMS-PATT1:FPICTURE"
 ]
 
 pvs = [