Merge branch 'master' of https://github.com/paulscherrerinstitute/eco

eco/acquisition/dia.py

@@ -2,6 +2,7 @@ from time import sleep
 from datetime import datetime
 from ..acquisition.utilities import Acquisition
 from detector_integration_api import DetectorIntegrationClient
+import os
 
 
 class DIAClient:

eco/bernina/config.py

@@ -279,7 +279,7 @@ components = [
             "pgroup": config.pgroup,
             "pedestal_filename": config.jf_pedestal_file,
             "gain_path": config.jf_gain_path,
-            # "config_default": config.daq_dia_config,
+            "config_default": config.daq_dia_config,
         },
     },
     {

eco/xoptics/pulse_picker.py

@@ -0,0 +1,49 @@
+from epics import PV
+from ..devices_general.motors import MotorRecord
+from ..aliases import Alias
+
+class Pulse_Picker:
+    def __init__(self,Id,name=None):	
+        self.Id = Id
+        self.name = name
+        self.Idmotor = 'SAROP21-OPPI103'
+        self._start = PV(Id+':seq0Ctrl-Start-I')
+        self._stop = PV(Id+':seq0Ctrl-Stop-I')
+        self._cycles = PV(Id+':seq0Ctrl-Cycles-I')
+        self._openclose = PV('SGE-CPCW-72-EVR0:Pul0-Polarity-Sel')
+        self.x = MotorRecord(self.Idmotor + ':MOTOR_X1')
+        self.y = MotorRecord(self.Idmotor + ':MOTOR_Y1')
+
+    def movein(self):
+        self.x.changeTo(10)
+        self.y.changeTo(-0.471)
+
+    def moveout(self):
+        self.x.changeTo(0)
+        self.y.changeTo(-0.471)
+
+    def open(self):
+        self._openclose.put(1)
+        print('Opened Pulse Picker')
+
+    def close(self):
+        self._openclose.put(0)
+        print('Closed Pulse Picker')
+
+    def stop(self):
+        self._stop.put(0)
+        print("Stopped Pulse Picker")
+
+    def start(self):
+        self._start.put(0)
+        print("Started Pulse Picker")
+
+    def cycles(self, n):
+        self._cycles.put(n)
+
+    def scan(self, adj, targetlist, sleeptime = 0.1):
+        self.stop()
+        for target in targetlist:
+            changer = adj.changeTo(target)
+            changer.wait()
+            print('Adjustable position {}'.format(adj.get_current_value()))