split file

sf_daq_broker/detector/make_crystfel_list.py

@@ -1,6 +1,4 @@
 import logging
-import os
-from time import sleep
 
 import h5py
 
@@ -84,38 +82,4 @@ def make_crystfel_list(data_file, run_info_file, detector):
                 print(f"{data_file} {delim}{frame_number}", file = f_list)
 
 
-def store_dap_info(beamline=None, pgroup=None, detector=None, start_pulse_id=None, stop_pulse_id=None, file_name_out=None):
-    if None in (beamline, pgroup, detector, start_pulse_id, stop_pulse_id, file_name_out):
-        _logger.error(f"input parameters to store_dap_info is not complete {beamline} {pgroup} {detector} {start_pulse_id} {stop_pulse_id} {file_name_out}")
-        return
-
-#    path_to_dap_files = f"/sf/{beamline}/data/{pgroup}/res/jungfrau/output/"
-    path_to_dap_files = f"/gpfs/photonics/swissfel/buffer/dap/data/{detector}"
-    if not os.path.exists(path_to_dap_files):
-        _logger.error(f"dap output is not reachable, may be dap is not working, path: {path_to_dap_files}")
-        return
-
-    dap_ending = set(p // 10000 * 10000 for p in range(start_pulse_id, stop_pulse_id + 1))
-
-    sleep(10)
-
-    n_lines_out = 0
-
-    with open(file_name_out, "w") as file_out:
-        for dap_f_ending in dap_ending:
-#            dap_file_name = f"{path_to_dap_files}/{dap_f_ending}.{detector}.dap"
-            dap_file_name = f"{path_to_dap_files}/{dap_f_ending}.dap"
-            if not os.path.exists(dap_file_name):
-                continue
-            with open(dap_file_name, "r") as dap_file:
-                all_lines = dap_file.read().splitlines()
-                for line in all_lines:
-                    pulse_id = int(line.split()[0])
-                    if start_pulse_id <= pulse_id <= stop_pulse_id:
-                        print(line, file=file_out)
-                        n_lines_out += 1
-
-    _logger.info(f"{n_lines_out} lines of dap output is stored in file {file_name_out}")
-
-
 

sf_daq_broker/detector/store_dap_info.py

@@ -0,0 +1,44 @@
+import logging
+import os
+from time import sleep
+
+
+_logger = logging.getLogger("broker_writer")
+
+
+
+def store_dap_info(beamline=None, pgroup=None, detector=None, start_pulse_id=None, stop_pulse_id=None, file_name_out=None):
+    if None in (beamline, pgroup, detector, start_pulse_id, stop_pulse_id, file_name_out):
+        _logger.error(f"input parameters to store_dap_info is not complete {beamline} {pgroup} {detector} {start_pulse_id} {stop_pulse_id} {file_name_out}")
+        return
+
+#    path_to_dap_files = f"/sf/{beamline}/data/{pgroup}/res/jungfrau/output/"
+    path_to_dap_files = f"/gpfs/photonics/swissfel/buffer/dap/data/{detector}"
+    if not os.path.exists(path_to_dap_files):
+        _logger.error(f"dap output is not reachable, may be dap is not working, path: {path_to_dap_files}")
+        return
+
+    dap_ending = set(p // 10000 * 10000 for p in range(start_pulse_id, stop_pulse_id + 1))
+
+    sleep(10)
+
+    n_lines_out = 0
+
+    with open(file_name_out, "w") as file_out:
+        for dap_f_ending in dap_ending:
+#            dap_file_name = f"{path_to_dap_files}/{dap_f_ending}.{detector}.dap"
+            dap_file_name = f"{path_to_dap_files}/{dap_f_ending}.dap"
+            if not os.path.exists(dap_file_name):
+                continue
+            with open(dap_file_name, "r") as dap_file:
+                all_lines = dap_file.read().splitlines()
+                for line in all_lines:
+                    pulse_id = int(line.split()[0])
+                    if start_pulse_id <= pulse_id <= stop_pulse_id:
+                        print(line, file=file_out)
+                        n_lines_out += 1
+
+    _logger.info(f"{n_lines_out} lines of dap output is stored in file {file_name_out}")
+
+
+

sf_daq_broker/writer/detector_writer.py

@@ -17,7 +17,8 @@ except ImportError:
 else:
     del ujson
 
-from sf_daq_broker.detector.make_crystfel_list import make_crystfel_list, store_dap_info
+from sf_daq_broker.detector.make_crystfel_list import make_crystfel_list
+from sf_daq_broker.detector.store_dap_info import store_dap_info
 from sf_daq_broker.writer.export_file import convert_file
 from sf_daq_broker.utils import json_save, json_load