From 9161edcb823a3b4625c5a0d01272d77f19fc252d Mon Sep 17 00:00:00 2001
From: Vonka Jakub <jakub.vonka@psi.ch>
Date: Fri, 23 Sep 2022 16:12:58 +0200
Subject: [PATCH] Added fast pulse picker shutter

---
 __pycache__/attocube.cpython-39.pyc         | Bin 12247 -> 11772 bytes
 __pycache__/channels_minimal.cpython-39.pyc | Bin 0 -> 296 bytes
 __pycache__/pp_shutter.cpython-39.pyc       | Bin 0 -> 1579 bytes
 channels_minimal.py                         |   6 ++--
 cristallina.py                              |  16 +++++++----
 pp_shutter.py                               |  29 ++++++++++++++++++++
 6 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 __pycache__/channels_minimal.cpython-39.pyc
 create mode 100644 __pycache__/pp_shutter.cpython-39.pyc
 create mode 100644 pp_shutter.py

diff --git a/__pycache__/attocube.cpython-39.pyc b/__pycache__/attocube.cpython-39.pyc
index a5fcde08a704662945abfec064d21cb84aa0a5d1..b569d57495c38928cd1609615baf209f0002c9f6 100644
GIT binary patch
delta 3111
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
HEp7M@yB4GO

delta 3553
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

diff --git a/__pycache__/channels_minimal.cpython-39.pyc b/__pycache__/channels_minimal.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4bdaabeb575a31cfbf3e4c65950f1321577c9329
GIT binary patch
literal 296
zcmYe~<>g`kg0;(aljkxrFgylvkO5GP!2yViMSw&)Lli>_Lpoy=V+tdXWJ+NQX3%7=
zk_vVVa&t8_&<zL<4mL2gv<ePzbq)y%^^K3L(uT`91-KiS8dwE*_=ouW>AL#42DwM-
z2Dk?4288+qyXrcIx%+7{-{MV4ElEu-$uBC7&&|xc#gm+on3tED1L3h3lz|y58H!kd
z&H)p@eD%}Q67}_R^GoweiuH@r;**Oqi%Sx7ax(K0^%DyUax#+>OEUBGfO0^lKC&#b
g;hDLKIeG<^w>WHa^HWN5QtdcEz6M#t!p6n~09T(<qyPW_

literal 0
HcmV?d00001

diff --git a/__pycache__/pp_shutter.cpython-39.pyc b/__pycache__/pp_shutter.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1ec00f3ce7ea9d9f93b6fdf625e434d141e81160
GIT binary patch
literal 1579
zcmbVM!EPHj5GA=QX}ytS8%<K6MGL~WEfDDkiXcIX1i8pUT@-~b1hb^<bynOh$+clY
zIoa19dkO-?NB={R57}!^`GuT1!?hCC?Wq(<j%J4Bo5#nM+uJFD_Vb5_`TK~Fzwpmy
z10Q(|-TeTAB8rw|L1&br%}Tb2W)UUNiHcNwNmP8nX0hrWlC1v`@<~S9;q=!h>ZEaA
zzAQETPyBhUja=v)6E@rDqaJ}*lNnWH#uS}J>TcMc;?}BvNoGAYPzlU^Jy2UJy(AZO
zmZ&>w2)-?~4ae`a>2xX%j~nl`UH<vBl+N*aW%=2$HoR_1r+HoEue9Zb<BijbOUEU5
z-HH)E0FZ?_;?gLdmz6^sGF4?XKP&t(_l*q+l?gf3e9rx`=K53{&#lf2uq<y(0h5y@
zuNq%Bo*zs?`oXhjqfg)b_Rz|6J`HH59hw`+Ig+t%Juv#vpF(#d7*=#e1X;0q7%aM?
zuOsNOXRBxxE2@}^{)izbQUu6|CzishUozGvGS3?;^Yb<-3{YcanZ+%8@lzY)omd8W
zZ7ifZ$$D+<bUC*Pxa=1Ccj{A25>ES5SvLB!!)mEs%KX(ev3DWy)ARAsT#iSJsxjV;
z-CX3h00ER`VdPlWby?)n7nOk+nB&c8U5oV{)BsY5!W3SJ0c`7nQfZ&2G=|^ut1mY^
zTIc0h=(?eeJO<wGfw3Yd<Q-M?ioRo41T_rou#TPU$m0I(E>tJHv_~*?RmNws@YmGd
zfpDm=8+I_ehuY9sv_t9$UG8q63c>#c=_6vddpIEQ+sDQg$P=UMQ+GB_#n?X%MP%3m
z5Bp$rJY132pd3XSVjn1a2&%H*D|QHPIcR3NZ7R?6${3w{t?bvZu<eJERK_~8_K+nI
zlm*duY(WHhYI|_spf6-*gRVY$8;2!1)D>YVP4F)FHt=^j|Ed6AL8yR(;h}~Lium8a
zHwo&&nZeB7khl2#i6%?N_m{nWe6?9*Q3pZA_FJ&lD4936A%f(ruB{N5=VBNLK)fZk
zE@P5Wi>R^`g&LlQXj35;m1;^YL^~AX_ePdCk%17Z%3=FmSYz+w5I9Y03s+|Sd4OiW
z!@w8bf`wYMhy{;x=t9=gK@ueqqiH|HCh%nM;e#6GmDMA7!#7{u?p3ED)cB%w9UHjc
Ue;w2&KXw&7LJ<ZEhIAPH4ay*P00000

literal 0
HcmV?d00001

diff --git a/channels_minimal.py b/channels_minimal.py
index cbc53bb..c0a4c57 100644
--- a/channels_minimal.py
+++ b/channels_minimal.py
@@ -5,12 +5,12 @@
 # BS channels
 
 # TODO: JF settings regarding raw conversion, compression, etc.
-detectors = [
+detectors_min = [
 # "JF16T03V01",
 ]
 
 
 
-channels = []
+channels_min = ["SARFE10-PSSS059:SPECTRUM_Y"]
 
-pvs =  []#pvs_slits + pv_channels + smaract_channels
+pvs_min =  ['SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-AVG']#pvs_slits + pv_channels + smaract_channels
diff --git a/cristallina.py b/cristallina.py
index bf0aa22..0380344 100644
--- a/cristallina.py
+++ b/cristallina.py
@@ -23,12 +23,16 @@ from slic.core.scanner import Scanner
 from slic.core.device.simpledevice import SimpleDevice
 
 from slic.devices.general.motor import Motor
+from slic.devices.general.shutter import Shutter
+from slic.devices.xoptics.pulsepicker import PulsePicker
 from slic.utils import devices, Marker, as_shortcut
 from slic.utils import Channels, Config, Elog, Screenshot, PV
 from slic.core.acquisition.fakeacquisition import FakeAcquisition
 
 from channels import detectors, channels, pvs
 from spreadsheet import overview
+from channels_minimal import detectors_min, channels_min, pvs_min
+from pp_shutter import PP_Shutter
 
 # DEVICES
 ## example devices and adjustables
@@ -56,9 +60,11 @@ def test_attenuator():
 
 ## Undulator
 import undulator
-
 undulators = undulator.Undulators()
 
+# Shutter
+shutter = PP_Shutter("SARES30-LTIM01-EVR0:RearUniv0-Ena-SP",name="Cristallina pulse picker shutter")  # Shutter buttton when using the pulse picker
+pulsepicker = PulsePicker("SAROP31-OPPI151","SARES30-LTIM01-EVR0:Pul3", name="Cristallina X-ray pulse picker OPPI151")
 
 ## Slits
 from slic.devices.xoptics import slits
@@ -84,9 +90,9 @@ pgroup = "p20443"    # commissioning Wavefront Sensor August 2022 (active)
 daq = SFAcquisition(
     instrument,
     pgroup,
-    default_channels=channels,
-    default_pvs=pvs,
-    default_detectors=detectors,
+    default_channels=channels_min ,
+    default_pvs=pvs_min,
+    default_detectors=detectors_min,
     rate_multiplicator=1,
 )
 
@@ -96,7 +102,7 @@ daq = SFAcquisition(
 # scan = Scanner(scan_info_dir=f"/sf/{instrument}/data/{pgroup}/res/scan_info", default_acquisitions=[daq], condition=None)
 
 # Run the scan only when gas monitor value larger than 10uJ (and smaller than 2000uJ):
-check_intensity_gas_monitor = PVCondition("SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-US", vmin=10, vmax=2000, wait_time=0.5, required_fraction=0.8)
+check_intensity_gas_monitor = PVCondition("SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-US", vmin=10, vmax=2000, wait_time=0.5, required_fraction=0.8)   # required fraction defines ammount of data recorded to save the step and move on to the next one
 
 scan = Scanner(default_acquisitions=[daq],condition = check_intensity_gas_monitor)
 gui = GUI(scan, show_goto=True, show_spec=True)
diff --git a/pp_shutter.py b/pp_shutter.py
new file mode 100644
index 0000000..b3e786c
--- /dev/null
+++ b/pp_shutter.py
@@ -0,0 +1,29 @@
+from slic.core.adjustable import PVAdjustable
+from slic.utils import typename
+
+
+class PP_Shutter:
+    """Class for when pulse picker is used as a shutter. Opening and closing is done with turning on and off the event reciever universal output ON and OFF."""
+    def __init__(self, ID,name="X-ray Pulse Picker Shutter"):
+        self.ID = ID
+        self.name = name or ID
+        pvname_setvalue = ID 
+        pvname_readback = ID
+        self._adj = PVAdjustable(pvname_setvalue, pvname_readback, accuracy=0, internal=True)
+
+    def close(self):
+        self._adj.set_target_value(0).wait()
+
+    def open(self):
+        self._adj.set_target_value(1).wait()
+
+    @property
+    def status(self):
+        state = self._adj.get_current_value()
+        if state is None:
+            return "not connected"
+        return "open" if state else "closed"
+
+    def __repr__(self):
+        tn = typename(self)
+        return f"{tn} \"{self.name}\" is {self.status}"