From 94ea1c4468fed5ee4be48e3334fe75541ecaba02 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 8 Jan 2019 15:44:52 +0100 Subject: ZMQ connection and setup stuff --- src/process_image.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/process_image.h') diff --git a/src/process_image.h b/src/process_image.h index 2a43d11d..b61fe83f 100644 --- a/src/process_image.h +++ b/src/process_image.h @@ -3,11 +3,11 @@ * * The processing pipeline for one image * - * Copyright © 2012-2018 Deutsches Elektronen-Synchrotron DESY, + * Copyright © 2012-2019 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. * * Authors: - * 2010-2016 Thomas White + * 2010-2019 Thomas White * 2014-2017 Valerio Mariani * 2017-2018 Yaroslav Gevorkov * @@ -37,6 +37,8 @@ struct index_args; +#include + #include "integration.h" #include "im-sandbox.h" #include "time-accounts.h" @@ -122,6 +124,7 @@ struct pattern_args { /* "Input" */ struct filename_plus_event *filename_p_e; + msgpack_object *msgpack_obj; }; -- cgit v1.2.3 From 4d62f31f90b76bce8b66fe2be6ccccb7b1542209 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 10 Jan 2019 17:02:15 +0100 Subject: Connect up hooks for unpacking MsgPack data --- src/process_image.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/process_image.h') diff --git a/src/process_image.h b/src/process_image.h index b61fe83f..54d97f77 100644 --- a/src/process_image.h +++ b/src/process_image.h @@ -53,6 +53,7 @@ enum { PEAK_ZAEF, PEAK_HDF5, PEAK_CXI, + PEAK_MSGPACK, }; -- cgit v1.2.3 From bb4c1e37b6787f6ea77820d21a81e8380309343a Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 15 Jan 2019 11:02:29 +0100 Subject: Compile cleanly without Msgpack or ZMQ --- src/process_image.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/process_image.h') diff --git a/src/process_image.h b/src/process_image.h index 54d97f77..a606fb0e 100644 --- a/src/process_image.h +++ b/src/process_image.h @@ -37,7 +37,9 @@ struct index_args; +#ifdef HAVE_MSGPACK #include +#endif #include "integration.h" #include "im-sandbox.h" @@ -125,7 +127,11 @@ struct pattern_args { /* "Input" */ struct filename_plus_event *filename_p_e; +#ifdef HAVE_MSGPACK msgpack_object *msgpack_obj; +#else + void *msgpack_obj; +#endif }; -- cgit v1.2.3 From 75d8d522008429c4973c28a2c5a770a581f5efd5 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 14 Mar 2019 15:28:39 +0100 Subject: indexamajig: Add --no-image-data --- src/process_image.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/process_image.h') diff --git a/src/process_image.h b/src/process_image.h index a606fb0e..48160bb6 100644 --- a/src/process_image.h +++ b/src/process_image.h @@ -119,6 +119,7 @@ struct index_args struct felix_options felix_opts; struct spectrum *spectrum; signed int wait_for_file; /* -1 means wait forever */ + int no_image_data; }; -- cgit v1.2.3