diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cell_explorer.c | 2 | ||||
| -rw-r--r-- | src/im-sandbox.c | 2 | ||||
| -rw-r--r-- | src/im-zmq.c | 9 | ||||
| -rw-r--r-- | src/indexamajig.c | 30 | ||||
| -rw-r--r-- | src/partialator.c | 1 | ||||
| -rw-r--r-- | src/pattern_sim.c | 1 | ||||
| -rw-r--r-- | src/process_hkl.c | 2 | ||||
| -rw-r--r-- | src/process_image.c | 26 | ||||
| -rw-r--r-- | src/whirligig.c | 1 |
9 files changed, 32 insertions, 42 deletions
diff --git a/src/cell_explorer.c b/src/cell_explorer.c index 5648ac3c..e481f85e 100644 --- a/src/cell_explorer.c +++ b/src/cell_explorer.c @@ -1999,8 +1999,6 @@ int main(int argc, char *argv[]) struct image cur; int i; - cur.det = NULL; - if ( read_chunk(st, &cur, NULL, STREAM_READ_UNITCELL) != 0 ) { break; } diff --git a/src/im-sandbox.c b/src/im-sandbox.c index 660c2ae1..83594585 100644 --- a/src/im-sandbox.c +++ b/src/im-sandbox.c @@ -59,8 +59,6 @@ #endif #include <events.h> -#include <hdf5-file.h> -#include <detector.h> #include "im-sandbox.h" #include "process_image.h" diff --git a/src/im-zmq.c b/src/im-zmq.c index 09230938..492b399e 100644 --- a/src/im-zmq.c +++ b/src/im-zmq.c @@ -41,11 +41,12 @@ #include <zmq.h> #include <msgpack.h> -#include "events.h" -#include "image.h" -#include "hdf5-file.h" -#include "utils.h" +#include <events.h> +#include <image.h> +#include <utils.h> + #include "im-zmq.h" + #include "datatemplate_priv.h" diff --git a/src/indexamajig.c b/src/indexamajig.c index bff9e90f..2081580b 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -50,23 +50,21 @@ #include <sys/stat.h> #include <fcntl.h> -#include "utils.h" -#include "hdf5-file.h" -#include "index.h" -#include "peaks.h" -#include "detector.h" -#include "filters.h" -#include "thread-pool.h" -#include "geometry.h" -#include "stream.h" -#include "reflist-utils.h" -#include "cell-utils.h" -#include "integration.h" -#include "taketwo.h" -#include "im-sandbox.h" -#include "image.h" -#include "datatemplate.h" +#include <utils.h> +#include <index.h> +#include <peaks.h> +#include <filters.h> +#include <thread-pool.h> +#include <geometry.h> +#include <stream.h> +#include <reflist-utils.h> +#include <cell-utils.h> +#include <integration.h> +#include <taketwo.h> +#include <image.h> +#include <datatemplate.h> +#include "im-sandbox.h" struct indexamajig_arguments { diff --git a/src/partialator.c b/src/partialator.c index b7641d08..959548d1 100644 --- a/src/partialator.c +++ b/src/partialator.c @@ -1378,7 +1378,6 @@ int main(int argc, char *argv[]) cur.div = NAN; cur.bw = NAN; - cur.det = NULL; if ( read_chunk(st, &cur, NULL, STREAM_READ_REFLECTIONS | STREAM_READ_UNITCELL) != 0 ) { diff --git a/src/pattern_sim.c b/src/pattern_sim.c index 9a144a36..2f9a228e 100644 --- a/src/pattern_sim.c +++ b/src/pattern_sim.c @@ -48,7 +48,6 @@ #include "cell.h" #include "cell-utils.h" #include "utils.h" -#include "hdf5-file.h" #include "detector.h" #include "peaks.h" #include "symmetry.h" diff --git a/src/process_hkl.c b/src/process_hkl.c index ec980db1..4e1b71cf 100644 --- a/src/process_hkl.c +++ b/src/process_hkl.c @@ -426,8 +426,6 @@ static int merge_all(Stream *st, RefList *model, RefList *reference, struct image image; int i; - image.det = NULL; - /* Get data from next chunk */ rval = read_chunk(st, &image, NULL, STREAM_READ_REFLECTIONS | STREAM_READ_UNITCELL); diff --git a/src/process_image.c b/src/process_image.c index 1d8def8b..2c4ec61c 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -40,23 +40,23 @@ #include <unistd.h> #include <sys/stat.h> -#include "utils.h" -#include "hdf5-file.h" -#include "index.h" -#include "peaks.h" -#include "filters.h" -#include "thread-pool.h" -#include "geometry.h" -#include "stream.h" -#include "reflist-utils.h" +#include <utils.h> +#include <index.h> +#include <peaks.h> +#include <filters.h> +#include <thread-pool.h> +#include <geometry.h> +#include <stream.h> +#include <reflist-utils.h> +#include <integration.h> +#include <detgeom.h> +#include <image-msgpack.h> + #include "process_image.h" -#include "integration.h" #include "predict-refine.h" #include "im-sandbox.h" -#include "time-accounts.h" #include "im-zmq.h" -#include "detgeom.h" - +#include "time-accounts.h" static float **backup_image_data(float **dp, struct detgeom *det) { diff --git a/src/whirligig.c b/src/whirligig.c index 843403ec..9a8dd07f 100644 --- a/src/whirligig.c +++ b/src/whirligig.c @@ -718,7 +718,6 @@ int main(int argc, char *argv[]) cur.div = NAN; cur.bw = NAN; - cur.det = NULL; if ( read_chunk(st, &cur, NULL, STREAM_READ_REFLECTIONS | STREAM_READ_UNITCELL) != 0 ) { |