From d06ce0f080fa226eb0d8696d61ec902724a62dd0 Mon Sep 17 00:00:00 2001
From: Sven Augustin <sven.augustin@psi.ch>
Date: Mon, 9 Mar 2020 17:44:36 +0000
Subject: [PATCH] split off data_api part of BSCounter into DBCounter

---
 slic/daq/bscounter.py | 71 ++++++++++++-------------------------------
 slic/daq/dbcounter.py | 57 ++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 51 deletions(-)
 create mode 100644 slic/daq/dbcounter.py

diff --git a/slic/daq/bscounter.py b/slic/daq/bscounter.py
index 583edf764..0b7973edb 100644
--- a/slic/daq/bscounter.py
+++ b/slic/daq/bscounter.py
@@ -2,7 +2,6 @@ from datetime import datetime, timedelta
 import os
 import zmq
 
-import data_api as dapi
 from bsread.h5 import receive
 from bsread.avail import dispatcher
 
@@ -12,6 +11,12 @@ from .utils import can_create_file, fix_hdf5_filename
 
 
 
+def bsread_to_h5(filename, channels, n_pulses=100, queue_size=100, mode=zmq.SUB):
+    source = dispatcher.request_stream(channels)
+    receive(source, filename, queue_size=queue_size, mode=mode, n_messages=n_pulses)
+
+
+
 class BSCounter(BaseCounter):
 
     def __init__(self, default_channels=None, default_path="."):
@@ -19,57 +24,21 @@ class BSCounter(BaseCounter):
         self.default_path = default_path
 
 
-    def acquire(self, filename=None, n_pulses=100, **kwargs):
-        acq = lambda: self.h5(filename=filename, n_pulses=n_pulses, **kwargs)
+    def acquire(self, filename=None, channels=None, use_default_path=True, **kwargs):
+        if filename and use_default_path:
+            filename = os.path.join(self.default_path, filename)
+
+        filename = fix_hdf5_filename(filename)
+
+        if not can_create_file(filename):
+            return
+
+        if not channels:
+            print("No channels specified, using default channel list.")
+            channels = self.default_channels
+
+        acq = lambda: bsread_to_h5(filename, channels, **kwargs)
         return Acquisition(acq, hold=False)
 
 
-    def h5(self, filename=None, channels=None, n_pulses=None, use_default_path=True, queue_size=100, mode=zmq.SUB):
-        if filename and use_default_path:
-            filename = os.path.join(self.default_path, filename)
-
-        filename = fix_hdf5_filename(filename)
-
-        if not can_create_file(filename):
-            return
-
-        if not channels:
-            print("No channels specified, using default channel list.")
-            channels = self.default_channels
-
-        source = dispatcher.request_stream(channels)
-        receive(source, filename, queue_size=queue_size, mode=mode, n_messages=n_pulses)
-
-
-    def h5_db(self, filename=None, use_default_path=True, **kwargs):
-        if filename and use_default_path:
-            filename = os.path.join(self.default_path, filename)
-
-        filename = fix_hdf5_filename(filename)
-
-        if not can_create_file(filename):
-            return
-
-        data = self.db(**kwargs)
-        data.to_hdf(filename, "/data")
-
-
-    def db(self, channels=None, start_time_delta=None, end_time_delta=None):
-        if not channels:
-            print("No channels specified, using default channel list.")
-            channels = self.default_channels
-
-        start_time_delta = start_time_delta if start_time_delta is not None else dict(seconds=0)
-        end_time_delta   = end_time_delta   if end_time_delta   is not None else dict(seconds=1)
-
-        start_time_delta = timedelta(**start_time_delta)
-        end_time_delta   = timedelta(**end_time_delta)
-
-        now   = datetime.now()
-        end   = now - end_time_delta
-        start = end - start_time_delta
-
-        return dapi.get_data(channels=channels, start=start, end=end)
-
-
 
diff --git a/slic/daq/dbcounter.py b/slic/daq/dbcounter.py
new file mode 100644
index 000000000..6978cde43
--- /dev/null
+++ b/slic/daq/dbcounter.py
@@ -0,0 +1,57 @@
+from datetime import datetime, timedelta
+import os
+import zmq
+
+import data_api as dapi
+
+from .acquisition import Acquisition
+from .basecounter import BaseCounter
+from .utils import can_create_file, fix_hdf5_filename
+
+
+
+def dapi_to_h5(filename, channels, **kwargs):
+    data = dapi_get(channels, **kwargs)
+    data.to_hdf(filename, "/data")
+
+
+def dapi_get(channels, start_time_delta=None, end_time_delta=None):
+    start_time_delta = start_time_delta if start_time_delta is not None else dict(seconds=0)
+    end_time_delta   = end_time_delta   if end_time_delta   is not None else dict(seconds=1)
+
+    start_time_delta = timedelta(**start_time_delta)
+    end_time_delta   = timedelta(**end_time_delta)
+
+    now   = datetime.now()
+    end   = now - end_time_delta
+    start = end - start_time_delta
+
+    return dapi.get_data(channels=channels, start=start, end=end)
+
+
+
+class DBCounter(BaseCounter):
+
+    def __init__(self, default_channels=None, default_path="."):
+        self.default_channels = default_channels
+        self.default_path = default_path
+
+
+    def acquire(self, filename=None, channels=None, use_default_path=True, **kwargs):
+        if filename and use_default_path:
+            filename = os.path.join(self.default_path, filename)
+
+        filename = fix_hdf5_filename(filename)
+
+        if not can_create_file(filename):
+            return
+
+        if not channels:
+            print("No channels specified, using default channel list.")
+            channels = self.default_channels
+
+        acq = lambda: dapi_to_h5(filename, channels, **kwargs)
+        return Acquisition(acq, hold=False)
+
+
+