diff options
| -rw-r--r-- | libcrystfel/src/integration.c | 19 | ||||
| -rw-r--r-- | libcrystfel/src/integration.h | 7 | ||||
| -rw-r--r-- | src/process_image.c | 8 |
3 files changed, 25 insertions, 9 deletions
diff --git a/libcrystfel/src/integration.c b/libcrystfel/src/integration.c index bf8cfadd..46e1451d 100644 --- a/libcrystfel/src/integration.c +++ b/libcrystfel/src/integration.c @@ -1799,10 +1799,11 @@ static void apply_resolution_cutoff(Crystal *cr, double res) } -void integrate_all(struct image *image, IntegrationMethod meth, double push_res, - double ir_inn, double ir_mid, double ir_out, - IntDiag int_diag, - signed int idh, signed int idk, signed int idl) +void integrate_all_2(struct image *image, IntegrationMethod meth, + double push_res, + double ir_inn, double ir_mid, double ir_out, + IntDiag int_diag, + signed int idh, signed int idk, signed int idl) { int i; @@ -1847,6 +1848,16 @@ void integrate_all(struct image *image, IntegrationMethod meth, double push_res, } +void integrate_all(struct image *image, IntegrationMethod meth, + double ir_inn, double ir_mid, double ir_out, + IntDiag int_diag, + signed int idh, signed int idk, signed int idl) +{ + integrate_all_2(image, meth, 0.0, ir_inn, ir_mid, ir_out, + int_diag, idh, idk, idl); +} + + IntegrationMethod integration_method(const char *str, int *err) { int n, i; diff --git a/libcrystfel/src/integration.h b/libcrystfel/src/integration.h index 3fd4e4ac..2c5773c6 100644 --- a/libcrystfel/src/integration.h +++ b/libcrystfel/src/integration.h @@ -83,10 +83,15 @@ typedef enum { extern IntegrationMethod integration_method(const char *t, int *err); extern void integrate_all(struct image *image, IntegrationMethod meth, - double push_res, double ir_inn, double ir_mid, double ir_out, IntDiag int_diag, signed int idh, signed int idk, signed int idl); +extern void integrate_all_2(struct image *image, IntegrationMethod meth, + double push_res, + double ir_inn, double ir_mid, double ir_out, + IntDiag int_diag, + signed int idh, signed int idk, signed int idl); + #endif /* INTEGRATION_H */ diff --git a/src/process_image.c b/src/process_image.c index 51d6ac79..ba68021a 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -184,10 +184,10 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, /* Integrate all the crystals at once - need all the crystals so that * overlaps can be detected. */ - integrate_all(&image, iargs->int_meth, iargs->push_res, - iargs->ir_inn, iargs->ir_mid, iargs->ir_out, - iargs->int_diag, iargs->int_diag_h, - iargs->int_diag_k, iargs->int_diag_l); + integrate_all_2(&image, iargs->int_meth, iargs->push_res, + iargs->ir_inn, iargs->ir_mid, iargs->ir_out, + iargs->int_diag, iargs->int_diag_h, + iargs->int_diag_k, iargs->int_diag_l); write_chunk(st, &image, hdfile, iargs->stream_peaks, iargs->stream_refls); |