diff options
| author | Thomas White <taw@physics.org> | 2015-06-22 16:48:46 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2015-07-13 16:00:16 +0200 |
| commit | 7591530ff83fc538ac5d92792d01d3b6fe88c781 (patch) | |
| tree | 7760590990174119616043b945a0ebfd98629a6c /src/process_image.c | |
| parent | f801c63795f3abad546c240bc4c27032c3e3c785 (diff) | |
Re-work im-sandbox
... it certainly needed it.
Diffstat (limited to 'src/process_image.c')
| -rw-r--r-- | src/process_image.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/process_image.c b/src/process_image.c index 22ff4ec0..e7e3aa78 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -51,6 +51,7 @@ #include "process_image.h" #include "integration.h" #include "predict-refine.h" +#include "im-sandbox.h" static void try_refine_autoR(struct image *image, Crystal *cr) @@ -119,8 +120,8 @@ static void restore_image_data(float **dp, struct detector *det, float **bu) void process_image(const struct index_args *iargs, struct pattern_args *pargs, - Stream *st, int cookie, const char *tmpdir, int results_pipe, - int serial, pthread_mutex_t *term_lock) + Stream *st, int cookie, const char *tmpdir, + int serial, struct sb_shm *sb_shared) { int check; struct hdfile *hdfile; @@ -131,6 +132,7 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, char *rn; int n_crystals_left; float **prefilter; + int any_crystals; image.features = NULL; image.data = NULL; @@ -295,7 +297,7 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, iargs->ir_inn, iargs->ir_mid, iargs->ir_out, iargs->int_diag, iargs->int_diag_h, iargs->int_diag_k, iargs->int_diag_l, - term_lock); + &sb_shared->term_lock); ret = write_chunk(st, &image, hdfile, iargs->stream_peaks, iargs->stream_refls, @@ -315,12 +317,17 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, } /* Count crystals which are still good */ - pargs->n_crystals = 0; + pthread_mutex_lock(&sb_shared->totals_lock); + any_crystals = 0; for ( i=0; i<image.n_crystals; i++ ) { if ( crystal_get_user_flag(image.crystals[i]) == 0 ) { - pargs->n_crystals++; + sb_shared->n_crystals++; + any_crystals = 1; } } + sb_shared->n_processed++; + sb_shared->n_hadcrystals += any_crystals; + pthread_mutex_unlock(&sb_shared->totals_lock); for ( i=0; i<image.n_crystals; i++ ) { cell_free(crystal_get_cell(image.crystals[i])); |