From 7a172eff8b99583cfeec13a508ddacf1f7270e3b Mon Sep 17 00:00:00 2001
From: Sven Augustin <sven.augustin@psi.ch>
Date: Sun, 27 Jun 2021 11:10:25 +0200
Subject: [PATCH] updates

---
 maloja.py | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/maloja.py b/maloja.py
index 2245dfa..c2b529f 100644
--- a/maloja.py
+++ b/maloja.py
@@ -14,10 +14,13 @@ from slic.utils import devices
 
 from devices.attenuator import Attenuator
 from devices.undulator import Undulators
+from devices.magnet import Magnet
 
 
 dummy = DummyAdjustable(units="au")
 
+magnet = Magnet()
+
 jet_delay = PVAdjustable("SATES20-CVME-EVR0:Pul6-Delay-SP", "SATES20-CVME-EVR0:Pul6-Delay-RB", accuracy=1, name="Jet Delay")
 
 waveplate = Motor("SLAAT21-LMOT-M702:MOT", name="Laser Waveplate")
@@ -40,13 +43,8 @@ mot1_z = SmarActAxis("SATES21-XSMA166:MOT6", name="Table 1: sma Z")
 mot3_z = SmarActAxis("SATES23-XSMA169:MOT3", name="Table 3: sma Z")
 
 
-channels_nbs = [
 #    "SLAAR11-LTIM01-EVR0:DUMMY_PV5_NBS",
-    "SATES20-CVME-EVR0:DUMMY_PV1_NBS",
-    "SATES20-CVME-EVR0:DUMMY_PV2_NBS",
-    "SATES20-CVME-EVR0:DUMMY_PV3_NBS",
-    "SATES20-CVME-EVR0:DUMMY_PV4_NBS",
-]
+channels_nbs = [f"SATES20-CVME-EVR0:DUMMY_PV{i+1}_NBS" for i in range(10)]
 
 
 channels_inten = [
@@ -72,8 +70,8 @@ channels_ks = [
 ]
 
 channels_cam = [
-#    "SATES21-CAMS154-M1:FPICTURE",
-#    "SATES24-CAMS161-M1:FPICTURE",
+    "SATES21-CAMS154-M1:FPICTURE",
+    "SATES24-CAMS161-M1:FPICTURE",
 ]
 
 channels_giges = [
@@ -88,17 +86,14 @@ channels = channels_nbs + channels_inten + channels_ks + channels_giges + channe
 
 pvs = [
     "SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG",
-    "SATES20-CVME-EVR0:DUMMY_PV1_NBS.INP",
-    "SATES20-CVME-EVR0:DUMMY_PV2_NBS.INP",
-    "SATES20-CVME-EVR0:DUMMY_PV3_NBS.INP",
-    "SATES20-CVME-EVR0:DUMMY_PV4_NBS.INP",
-    "SATUN21-UIND030:FELPHOTENE",
-    "SATUN15-UIND030:FELPHOTENE"
 ]
 
+pvs += [f"SATES20-CVME-EVR0:DUMMY_PV{i+1}_NBS.INP" for i in range(10)]
+pvs += [f"SATUN{i:02}-UIND030:FELPHOTENE" for i in range(6, 22+1) if i != 14]
+
 
 detectors = [
-    "JF15T08V01"
+#    "JF15T08V01"
 ]
 
 
@@ -114,8 +109,8 @@ pgroup = "p19342" # XMCD
 daq = SFAcquisition(instrument, pgroup, default_channels=channels, default_pvs=pvs, default_detectors=detectors, rate_multiplicator=1)
 #daq = FakeAcquisition(instrument, pgroup)
 
-#check_intensity = PVCondition("SATFE10-PEPG046:FCUP-INTENSITY-CAL", vmin=5, vmax=None, wait_time=3, required_fraction=0.8)
-check_intensity = None
+check_intensity = PVCondition("SATBD01-DBPM060:Q2", vmin=5, vmax=None, wait_time=3, required_fraction=0.8)
+#check_intensity = None
 
 scan = Scanner(scan_info_dir=f"/sf/{instrument}/data/{pgroup}/res/scan_info", default_acquisitions=[daq], condition=check_intensity)