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/indexamajig.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'src/indexamajig.c') diff --git a/src/indexamajig.c b/src/indexamajig.c index 2d584726..356d0c94 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -86,6 +86,7 @@ static void show_help(const char *s) " --profile Show timing data for performance monitoring\n" " --temp-dir= Put the temporary folder under \n" " --wait-for-file= Time to wait for each file before processing\n" +" --zmq-msgpack Receive data in MessagePack format over ZMQ\n" "\nPeak search options:\n\n" " --peaks= Peak search method (zaef,peakfinder8,peakfinder9,hdf5,cxi)\n" " Default: zaef\n" @@ -340,6 +341,8 @@ int main(int argc, char *argv[]) int if_retry = 1; int serial_start = 1; char *spectrum_fn = NULL; + int zmq = 0; + char *zmq_address = NULL; /* Defaults */ iargs.cell = NULL; @@ -457,6 +460,7 @@ int main(int argc, char *argv[]) {"no-multi", 0, &if_multi, 0}, {"multi", 0, &if_multi, 1}, {"overpredict", 0, &iargs.overpredict, 1}, + {"zmq-msgpack", 0, &zmq, 1}, /* Long-only options which don't actually do anything */ {"no-sat-corr", 0, &iargs.satcorr, 0}, @@ -1297,8 +1301,22 @@ int main(int argc, char *argv[]) gsl_set_error_handler_off(); + if ( zmq ) { + char line[1024]; + char *rval; + rval = fgets(line, 1024, fh); + if ( rval == NULL ) { + ERROR("Failed to read ZMQ server/port from input.\n"); + return 1; + } + chomp(line); + zmq_address = strdup(line); + /* In future, read multiple addresses and hand them out + * evenly to workers */ + } + r = create_sandbox(&iargs, n_proc, prefix, config_basename, fh, - st, tmpdir, serial_start); + st, tmpdir, serial_start, zmq_address); free_imagefile_field_list(iargs.copyme); cell_free(iargs.cell); -- 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/indexamajig.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/indexamajig.c') diff --git a/src/indexamajig.c b/src/indexamajig.c index 356d0c94..37cec295 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -1006,6 +1006,8 @@ int main(int argc, char *argv[]) iargs.peaks = PEAK_CXI; } else if ( strcmp(speaks, "peakfinder9") == 0 ) { iargs.peaks = PEAK_PEAKFINDER9; + } else if ( strcmp(speaks, "msgpack") == 0 ) { + iargs.peaks = PEAK_MSGPACK; } else { ERROR("Unrecognised peak detection method '%s'\n", speaks); return 1; -- 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/indexamajig.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/indexamajig.c') diff --git a/src/indexamajig.c b/src/indexamajig.c index 37cec295..5b2f380e 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -400,6 +400,7 @@ int main(int argc, char *argv[]) iargs.fix_bandwidth = -1.0; iargs.fix_divergence = -1.0; iargs.profile = 0; + iargs.no_image_data = 0; iargs.taketwo_opts.member_thresh = -1; iargs.taketwo_opts.len_tol = -1.0; iargs.taketwo_opts.angle_tol = -1.0; @@ -461,6 +462,7 @@ int main(int argc, char *argv[]) {"multi", 0, &if_multi, 1}, {"overpredict", 0, &iargs.overpredict, 1}, {"zmq-msgpack", 0, &zmq, 1}, + {"no-image-data", 0, &iargs.no_image_data, 1}, /* Long-only options which don't actually do anything */ {"no-sat-corr", 0, &iargs.satcorr, 0}, -- cgit v1.2.3 From 7edc4d2826d5b07487fad1dc5ede6cf3bbf250dc Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 14 Mar 2019 17:37:27 +0100 Subject: Add documentation --- src/indexamajig.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/indexamajig.c') diff --git a/src/indexamajig.c b/src/indexamajig.c index 5b2f380e..dbd77ad8 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -87,9 +87,10 @@ static void show_help(const char *s) " --temp-dir= Put the temporary folder under \n" " --wait-for-file= Time to wait for each file before processing\n" " --zmq-msgpack Receive data in MessagePack format over ZMQ\n" +" --no-image-data Do not load image data (from ZMQ)\n" "\nPeak search options:\n\n" -" --peaks= Peak search method (zaef,peakfinder8,peakfinder9,hdf5,cxi)\n" -" Default: zaef\n" +" --peaks= Peak search method. Default: zaef\n" +" (zaef,peakfinder8,peakfinder9,hdf5,cxi,msgpack)\n" " --peak-radius= Integration radii for peak search\n" " --min-peaks= Minimum number of peaks for indexing\n" " --hdf5-peaks=

Find peaks table in HDF5 file here\n" -- cgit v1.2.3