From 26ee572acf473ef7900a8403e6ae5ccd3c9bdd14 Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Wed, 8 Apr 2020 17:25:35 +0200
Subject: [PATCH] Make SF starter more readable

---
 sf-writer/sf_h5_writer.cpp | 72 +++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 43 deletions(-)

diff --git a/sf-writer/sf_h5_writer.cpp b/sf-writer/sf_h5_writer.cpp
index 2e7bd7f..9b9a15a 100644
--- a/sf-writer/sf_h5_writer.cpp
+++ b/sf-writer/sf_h5_writer.cpp
@@ -1,58 +1,42 @@
 #include <iostream>
-#include <sstream>
 #include <stdexcept>
+#include <ZmqReceiver.hpp>
+#include <ZmqRecvModule.hpp>
+#include <H5WriteModule.hpp>
+#include <ProcessManager.hpp>
 
 #include "config.hpp"
-#include "WriterManager.hpp"
-#include "ZmqReceiver.hpp"
-#include "ProcessManager.hpp"
-
 #include "SfFormat.cpp"
 
 int main (int argc, char *argv[])
 {
-    if (argc != 10 && argc != 11) {
+    if (argc != 7) {
         cout << endl;
-        cout << "Usage: sf_h5_writer [connection_address] [output_file] [n_frames]";
-        cout << " [rest_port] [user_id] [bsread_address] [n_modules] [n_bad_modules] [detector_name]";
-        cout << " [frames_per_file]" << endl;
-        cout << "\tconnection_address: Address to connect to the stream (PULL). Example: tcp://127.0.0.1:40000" << endl;
-        cout << "\toutput_file: Name of the output file." << endl;
-        cout << "\tn_frames: Number of images to acquire. 0 for infinity (until /stop is called)." << endl;
+        cout << "Usage: sf_h5_writer [connection_address] [rest_port]";
+        cout << " [bsread_address] [n_modules] [n_bad_modules] [detector_name]";
+        cout << endl;
+        cout << "\tconnection_address: Address to connect to the stream";
+        cout << " (PULL). Example: tcp://127.0.0.1:40000" << endl;
         cout << "\trest_port: Port to start the REST Api on." << endl;
-        cout << "\tuser_id: uid under which to run the writer. -1 to leave it as it is." << endl;
         cout << "\tbsread_address: HTTP address of the bsread REST api." << endl;
         cout << "\tn_modules: Number of detector modules to be written." << endl;
-        cout << "\tn_bad_modules: Number of detector modules which has more then half bad pixels" << endl;
-        cout << "\tdetector_name: Name of the detector, data will be written as data/detector_name/ " << endl;
-        cout << "\tframes_per_file: Default = 0. How many frames to write to one file. " << endl;
+        cout << "\tn_bad_modules: Number of detector modules which";
+        cout << " has more then half bad pixels" << endl;
+        cout << "\tdetector_name: Name of the detector,";
+        cout << " data will be written as data/detector_name/" << endl;
         cout << endl;
 
         exit(-1);
     }
 
     string connect_address = string(argv[1]);
-    string output_file = string(argv[2]);
-    int n_frames =  atoi(argv[3]);
-    int rest_port = atoi(argv[4]);
-    int user_id = atoi(argv[5]);
-    string bsread_rest_address = string(argv[6]);
-    int n_modules = atoi(argv[7]);
-    int n_bad_modules = atoi(argv[8]);
-    string detector_name = string(argv[9]);
+    int rest_port = atoi(argv[2]);
+    string bsread_rest_address = string(argv[3]);
+    int n_modules = atoi(argv[4]);
+    int n_bad_modules = atoi(argv[5]);
+    string detector_name = string(argv[6]);
 
-    int frames_per_file = 0;
-    if (argc == 11) {
-        frames_per_file = atoi(argv[10]);
-    }
-
-    if (user_id != -1) {
-        writer_utils::set_process_id(user_id);
-    }
-
-    writer_utils::create_destination_folder(output_file);   
-
-    auto header_values = shared_ptr<unordered_map<string, HeaderDataType>>(new unordered_map<string, HeaderDataType> {
+    unordered_map<string, HeaderDataType> header_values {
         {"pulse_id", HeaderDataType("uint64")},
         {"frame", HeaderDataType("uint64")},
         {"is_good_frame", HeaderDataType("uint64")},
@@ -69,16 +53,18 @@ int main (int argc, char *argv[])
         {"framenums", HeaderDataType("uint64", n_modules)},
         
         {"module_number", HeaderDataType("uint64", n_modules)}
-    });
+    };
 
-    SfFormat format(detector_name, n_bad_modules);   
-
-    WriterManager writer_manager(format.get_input_value_type(), output_file, n_frames);
-    ZmqReceiver receiver(connect_address, config::zmq_n_io_threads, config::zmq_receive_timeout, header_values);
+    SfFormat format(detector_name, n_bad_modules);
     RingBuffer ring_buffer(config::ring_buffer_n_slots);
 
-    ProcessManager process_manager(writer_manager, receiver, ring_buffer, format, rest_port, bsread_rest_address, frames_per_file);
-    process_manager.run_writer();
+    ZmqRecvModule recv_module(ring_buffer, header_values);
+    H5WriteModule write_module(ring_buffer, header_values, format);
+
+    recv_module.start_recv(connect_address, 4);
+
+    ProcessManager process_manager(write_module, recv_module);
+    process_manager.start_rest_api(rest_port);
 
     return 0;
 }