diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/indexamajig.c | 5 | ||||
| -rw-r--r-- | src/process_image.c | 8 | ||||
| -rw-r--r-- | src/process_image.h | 1 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/indexamajig.c b/src/indexamajig.c index 80894804..6aeaaad5 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -99,6 +99,9 @@ static void show_help(const char *s) " hdf5 : Get from a table in HDF5 file.\n" " --hdf5-peaks=<p> Find peaks table in HDF5 file here.\n" " Default: /processing/hitfinder/peakinfo\n" +" --cxidb-hdf5-peaks Peaks in the HDF5 file are in CXIDB format.\n" +" Only used in conjunction with the --hdf5-peaks,\n" +" ignored otherwise." " --integration=<meth> Perform final pattern integration using <meth>.\n" "\n\n" "For more control over the process, you might need:\n\n" @@ -216,6 +219,7 @@ int main(int argc, char *argv[]) iargs.beam = &beam; iargs.element = NULL; iargs.hdf5_peak_path = strdup("/processing/hitfinder/peakinfo"); + iargs.cxidb_hdf5_peaks = 0; iargs.copyme = NULL; iargs.pk_inn = -1.0; iargs.pk_mid = -1.0; @@ -265,6 +269,7 @@ int main(int argc, char *argv[]) {"no-use-saturated", 0, &iargs.use_saturated, 0}, {"no-revalidate", 0, &iargs.no_revalidate, 1}, {"check-hdf5-snr", 0, &iargs.check_hdf5_snr, 1}, + {"cxidb-hdf5-peaks", 0, &iargs.cxidb_hdf5_peaks, 1}, /* Long-only options which don't actually do anything */ {"no-sat-corr", 0, &iargs.satcorr, 0}, diff --git a/src/process_image.c b/src/process_image.c index 41810e12..57bc9e3c 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -179,12 +179,8 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, case PEAK_HDF5: /* Get peaks from HDF5 */ - if ( !single_panel_data_source(iargs->det, iargs->element) ) { - ERROR("Peaks from HDF5 file not supported with " - "multiple panel data sources.\n"); - } - - if ( get_peaks(&image, hdfile, iargs->hdf5_peak_path) ) { + if ( get_peaks(&image, hdfile, iargs->hdf5_peak_path, + iargs->cxidb_hdf5_peaks, pargs->filename_p_e) ) { ERROR("Failed to get peaks from HDF5 file.\n"); } if ( !iargs->no_revalidate ) { diff --git a/src/process_image.h b/src/process_image.h index 5d9f2c27..891553e6 100644 --- a/src/process_image.h +++ b/src/process_image.h @@ -64,6 +64,7 @@ struct index_args struct beam_params *beam; char *element; char *hdf5_peak_path; + int cxidb_hdf5_peaks; float pk_inn; float pk_mid; float pk_out; |