Merge branch 'eiger' of github.com:paulscherrerinstitute/sf_daq_buffer into eiger

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
 

eiger/sf-daq-4/control/start_acquisition.sh

@@ -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

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...")

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

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();
@@ -77,7 +76,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,
@@ -100,7 +99,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);
         }