rewrite bsacquisition with help of Sven Augustin

ext/bscacquisition.py

@@ -1,6 +1,5 @@
-
 import h5py
-import numpy as np
+#import numpy as np
 
 from slic.core.acquisition.acquisition import Acquisition
 
@@ -9,31 +8,31 @@ from slic.core.acquisition.acquisition import Acquisition
 
 class BSCAcquisition(Acquisition):
 
+    def __init__(self, bscache, *args, **kwargs):
+        self.bscache = bscache
+        self.grp = 0
+        super().__init__(*args, **kwargs)
+
     def setGroup(self,idx):
         self.grp = idx
-        
+
     def _acquire(self, filename, channels=None, data_base_dir=None, scan_info=None, n_pulses=100, **kwargs):
+        self.bscache.flush()
+        data = []
+        for i in range(n_pulses):
+            #print('Requested %i' % i)
+            data.append(next(self.bscache))
+            #print('Received %i' % i)
 
-        if not hasattr(self,'grp'):
+        with h5py.File(filename,'a') as hid:
-            self.grp = 0
+            for chn in channels:
-            
+                singledata = [ele[chn] for ele in data]
-        queue =channels[0]  # abusing interface since BSAcquisition assume a list of channels
+                gid = hid.create_group(chn)
-        # clear the queue
+                gid.create_dataset('data', data=singledata)
-        queue.flush()
+
-        # gather data
+            singledata = [ele['pid'] for ele in data]
-        data = [queue.__next__() for i in range(n_pulses)]
+            if self.grp == 0:
-        # write out the data file
+                hid.create_dataset('pulse_id', data=singledata)
-        hid = h5py.File(filename,'a')
+            else:
-        for chn in queue.channels:
+                hid.create_dataset('pulse_id_grp%d' % self.grp, data=singledata)
-            singledata = [ele[chn] for ele in data]
-            gid = hid.create_group(chn)
-            gid.create_dataset('data', data = singledata)
-        singledata = [ele['pid'] for ele in data]
-     
-        if self.grp == 0:
-            hid.create_dataset('pulse_id', data = singledata)
-        else:
-            hid.create_dataset('pulse_id_grp%d' % self.grp, data = singledata)
-        hid.close()        
-