diff options
| author | Thomas White <taw@physics.org> | 2017-07-06 17:22:11 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2017-07-06 17:24:59 +0200 |
| commit | 5292f57d4434c7267e8d945871513d742ff42427 (patch) | |
| tree | d460aa5cef5a501516876850ef243cfc27313d5a /src/process_image.h | |
| parent | 48d4a6b8e82cce81222ec58fdfb488ed79ce0bcf (diff) | |
| parent | dc3395900fc3ce0d3961757628ff83ad6456be19 (diff) | |
Merge branch 'master' into taketwo
Diffstat (limited to 'src/process_image.h')
| -rw-r--r-- | src/process_image.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/process_image.h b/src/process_image.h index d41c23f5..ec51c188 100644 --- a/src/process_image.h +++ b/src/process_image.h @@ -3,12 +3,12 @@ * * The processing pipeline for one image * - * Copyright © 2012-2016 Deutsches Elektronen-Synchrotron DESY, + * Copyright © 2012-2017 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. * * Authors: * 2010-2016 Thomas White <taw@physics.org> - * 2014 Valerio Mariani + * 2014-2017 Valerio Mariani <valerio.mariani@desy.de> * * This file is part of CrystFEL. * @@ -42,6 +42,7 @@ struct index_args; enum { + PEAK_PEAKFINDER8, PEAK_ZAEF, PEAK_HDF5, PEAK_CXI, @@ -61,24 +62,32 @@ struct index_args float min_snr; int check_hdf5_snr; struct detector *det; - IndexingMethod *indm; - IndexingPrivate **ipriv; + IndexingPrivate *ipriv; int peaks; /* Peak detection method */ float tols[4]; struct beam_params *beam; char *hdf5_peak_path; + int half_pixel_shift; float pk_inn; float pk_mid; float pk_out; float ir_inn; float ir_mid; float ir_out; - struct copy_hdf5_field *copyme; + int min_res; + int max_res; + int max_n_peaks; + int min_pix_count; + int max_pix_count; + int local_bg_radius; + int min_peaks; + struct imagefile_field_list *copyme; int integrate_saturated; int use_saturated; int no_revalidate; int stream_peaks; int stream_refls; + int stream_nonhits; IntegrationMethod int_meth; IntDiag int_diag; signed int int_diag_h; |