From 8097bf06ea05e14f59b57965a4745836890b875a Mon Sep 17 00:00:00 2001
From: lhdamiani <lhdamiani@gmail.com>
Date: Thu, 15 Jul 2021 16:52:43 +0200
Subject: [PATCH 1/2] recv request without null terminator fix

---
 std-det-writer/src/main.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/std-det-writer/src/main.cpp b/std-det-writer/src/main.cpp
index 710525b..6266756 100644
--- a/std-det-writer/src/main.cpp
+++ b/std-det-writer/src/main.cpp
@@ -54,11 +54,11 @@ int main (int argc, char *argv[])
 
     char recv_buffer[8192];
     while (true) {
-        zmq_recv(receiver, &recv_buffer, sizeof(recv_buffer), 0);
-        
+        auto nbytes = zmq_recv(receiver, &recv_buffer, sizeof(recv_buffer), 0);
         rapidjson::Document document;
-        if (document.Parse(recv_buffer).HasParseError()) {
-            continue;
+        if (document.Parse(recv_buffer, nbytes).HasParseError()) {
+            std::string error_str(recv_buffer, nbytes);
+            throw runtime_error(error_str);
         }
         
         const string output_file = document["output_file"].GetString();
@@ -66,7 +66,6 @@ int main (int argc, char *argv[])
         const int run_id = document["run_id"].GetInt();
         const int i_image = document["i_image"].GetInt();
         const int n_images = document["n_images"].GetInt();
-        
         // i_image == n_images -> end of run.
         if (i_image == n_images) {
             writer.close_run();
@@ -85,7 +84,7 @@ int main (int argc, char *argv[])
         // i_image == 0 -> we have a new run.
         if (i_image == 0) {
             auto image_meta = (ImageMetadata*)
-                    image_buffer.get_slot_meta(image_id);
+                image_buffer.get_slot_meta(image_id);
 
             writer.open_run(output_file,
                             run_id,
@@ -108,7 +107,7 @@ int main (int argc, char *argv[])
         // Only the first instance writes metadata.
         if (i_writer == 0) {
             auto image_meta = (ImageMetadata*)
-                    image_buffer.get_slot_meta(image_id);
+                image_buffer.get_slot_meta(image_id);
             writer.write_meta(run_id, i_image, image_meta);
         }
 

From c0574fbc09d602ca787aa7c79e8d7bbe3ec6018e Mon Sep 17 00:00:00 2001
From: lhdamiani <lhdamiani@gmail.com>
Date: Thu, 15 Jul 2021 16:53:15 +0200
Subject: [PATCH 2/2] eiger control scripts improvements

---
 eiger/sf-daq-4/control/kill_controls.sh     |   2 +-
 eiger/sf-daq-4/control/start_acquisition.sh |  28 -------------
 eiger/sf-daq-4/control/start_requests.py    |  42 ++++++++++++++++++++
 eiger/test/trimbit.py                       |   4 +-
 eiger/test/trimbits.sn000                   | Bin 1048648 -> 2097224 bytes
 5 files changed, 45 insertions(+), 31 deletions(-)
 delete mode 100755 eiger/sf-daq-4/control/start_acquisition.sh
 create mode 100644 eiger/sf-daq-4/control/start_requests.py

diff --git a/eiger/sf-daq-4/control/kill_controls.sh b/eiger/sf-daq-4/control/kill_controls.sh
index e93e2f5..ebcd39d 100755
--- a/eiger/sf-daq-4/control/kill_controls.sh
+++ b/eiger/sf-daq-4/control/kill_controls.sh
@@ -47,7 +47,7 @@ if (( ${ASSEMBLER} == 1 )); then
 fi
 
 if (( ${WRITER} == 1 )); then
-    echo "Killing assembler..."
+    echo "Killing writer..."
     ps aux | grep mpiexec | awk 'NR > 1 { print prev } { prev = $2 }' | xargs -I{} kill {}
 fi
 
diff --git a/eiger/sf-daq-4/control/start_acquisition.sh b/eiger/sf-daq-4/control/start_acquisition.sh
deleted file mode 100755
index ad2a48b..0000000
--- a/eiger/sf-daq-4/control/start_acquisition.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-ENDPOINT="http://127.0.0.1:5000"
-SYNC="/write_sync"
-ASYNC="/write_async"
-KILL="/kill"
-HEADER="Content-Type:application/json"
-N_IMAGES=500
-SOURCES="eiger"
-# Define a timestamp function
-timestamp() {
-  date +"%T" # current time
-}
-generate_post_data()
-{
-  cat <<EOF
-{"n_images": 5, "output_file": "$OUTPUT_FILE", "sources": "eiger"}
-EOF
-}
-
-for((i=1;i<=100;i+=1)); do 
-    TIMESTAMP=$(date +%d-%m-%Y_%H-%M-%S)
-    echo "[${TIMESTAMP}] Starting Request ${i}..."
-    OUTPUT_FILE="/home/hax_l/tests/"${TIMESTAMP}"_"${i}".h5"
-    # echo "$(generate_post_data)"
-    curl -X POST -H ${HEADER} --data "$(generate_post_data)" ${ENDPOINT}${SYNC}
-    
-    
-done
\ No newline at end of file
diff --git a/eiger/sf-daq-4/control/start_requests.py b/eiger/sf-daq-4/control/start_requests.py
new file mode 100644
index 0000000..cc3624e
--- /dev/null
+++ b/eiger/sf-daq-4/control/start_requests.py
@@ -0,0 +1,42 @@
+from datetime import datetime
+import requests
+import time
+import json
+  
+# writer agent endpoint
+URL = "http://127.0.0.1:5000"
+# type of write request
+SYNC = "/write_sync"
+ASYNC = "/write_async"
+KILL = "/write_kill"
+# details of request
+n_images = 10
+n_acquisitions = 2
+headers = {'Content-type': 'application/json'}
+
+print("Performing sync aquisitions...")
+for i in range(0,n_acquisitions):
+    output_file ='/home/hax_l/tests/eiger_sync_%s_%s.h5' % (datetime.now().strftime("%H%M%S"), i)
+    data = {'sources':'eiger', 'n_images':n_images, 'output_file':output_file}
+    print("REQUEST: ", i)
+    print("DATA: ", data)
+    
+    r = requests.post(url = "http://127.0.0.1:5000/write_sync", json=data, headers=headers)
+    print("RESPONSE FROM REQUEST: ", r.text)
+    data = None
+    time.sleep(1)
+
+# time.sleep(3)
+# print("Performing async aquisitions...")
+# for i in range(0,n_acquisitions):
+#     output_file ='/home/hax_l/tests/eiger_async_%s_%s.h5' % (datetime.now().strftime("%H%M%S"), i)
+#     data = {'sources':'eiger', 'n_images':n_images, 'output_file':output_file}
+#     print("REQUEST: ", i)
+#     print("DATA: ", data)
+    
+#     r = requests.post(url = "http://127.0.0.1:5000/write_async", json=data, headers=headers)
+#     data = None
+#     time.sleep(1)
+
+
+# #//TODO  print("Testing kill aquisitions...")
\ No newline at end of file
diff --git a/eiger/test/trimbit.py b/eiger/test/trimbit.py
index 1e0d397..e050532 100644
--- a/eiger/test/trimbit.py
+++ b/eiger/test/trimbit.py
@@ -8,10 +8,10 @@ plt.ion()
 dacs = np.array([   0, 2480, 2900, 1400, 4000, 2556,  898,  848,    0,  855, 1100,
        1100,  982,  895, 2000, 1550,  570,    0], dtype=np.int32)
 
-tb = np.zeros((256,1024), dtype = np.int32)
+tb = np.zeros((512,1024), dtype = np.int32)
 
 # Create the desired pattern 
-for row in range(0,256,64):
+for row in range(0,512,64):
     for col in range(0,1024,64):
         print(f'{row}, {col}')
         tb[row:row+32, col:col+32] = 63
diff --git a/eiger/test/trimbits.sn000 b/eiger/test/trimbits.sn000
index 00b968be5921a0639e2a165d993aed94c97232b3..b3a6ced13ebaa9eb389985ea576217d7a9599fa2 100644
GIT binary patch
delta 15221
zcmeI$%Lzh33<Xfe|6faZrMP^hSjK?20l^Mj*vc!zPSo{uFmNCQvI{4xo2g!>T1!pI
zEb}a~%qr__vdu309CFMl=jUa-kL5j<@_qf=<8xC42oNAZfB*pk1PBlyK%f(WL8R^E
zQoaoY2oNAZfB*pk1PBly&<KdM4TzBd0RjXF5FkK+009C7dJzz5d%2W72@oJafB*pk
M1PBlyK%fyAesPI}CIA2c

delta 41
wcmX@n(7<@2!J(mrv4yFHxrL>LwS}#Py@jKNvxTdLyM?EPw}r2Te~N$y04wGU@&Et;