diff options
| author | Thomas White <taw@physics.org> | 2019-07-17 14:54:00 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2019-07-17 14:54:00 +0200 |
| commit | f25b274603861b2eaecbf995493b79530b69d6a9 (patch) | |
| tree | 7e7a48b77c2c356395b3464323f96503cb008053 /src/process_image.h | |
| parent | 2b2d41cd933bb1015fbf95b63dd8ec3c990b0767 (diff) | |
| parent | 8b3f748a90421152b364be5170415ee4e0a3b329 (diff) | |
Merge branch 'tom/zmq'
Diffstat (limited to 'src/process_image.h')
| -rw-r--r-- | src/process_image.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/process_image.h b/src/process_image.h index 5939ae4d..8d6682a6 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 <taw@physics.org> + * 2010-2019 Thomas White <taw@physics.org> * 2014-2017 Valerio Mariani <valerio.mariani@desy.de> * 2017-2018 Yaroslav Gevorkov <yaroslav.gevorkov@desy.de> * @@ -37,6 +37,10 @@ struct index_args; +#ifdef HAVE_MSGPACK +#include <msgpack.h> +#endif + #include "integration.h" #include "im-sandbox.h" #include "time-accounts.h" @@ -51,6 +55,7 @@ enum { PEAK_ZAEF, PEAK_HDF5, PEAK_CXI, + PEAK_MSGPACK, }; @@ -114,6 +119,7 @@ struct index_args struct felix_options felix_opts; Spectrum *spectrum; signed int wait_for_file; /* -1 means wait forever */ + int no_image_data; }; @@ -122,6 +128,11 @@ struct pattern_args { /* "Input" */ struct filename_plus_event *filename_p_e; +#ifdef HAVE_MSGPACK + msgpack_object *msgpack_obj; +#else + void *msgpack_obj; +#endif }; |