aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2014-12-12 21:01:17 +0100
committerThomas White <taw@physics.org>2014-12-14 07:17:48 +0100
commitff74e26ef0dfb7f1584bce67a9d9abf48170eca4 (patch)
treed10b2f62f7530df4f5a6f6183001f0482dbec99c /src
parentd5f011beac8badef95a65966935d4fc1b320e292 (diff)
Fussiness
Diffstat (limited to 'src')
-rw-r--r--src/indexamajig.c6
-rw-r--r--src/process_image.c2
-rw-r--r--src/process_image.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/indexamajig.c b/src/indexamajig.c
index 6aeaaad5..e3daa1c9 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -99,7 +99,7 @@ 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"
+" --cxi-hdf5-peaks Peaks in the HDF5 file are in CXI file format.\n"
" Only used in conjunction with the --hdf5-peaks,\n"
" ignored otherwise."
" --integration=<meth> Perform final pattern integration using <meth>.\n"
@@ -219,7 +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.cxi_hdf5_peaks = 0;
iargs.copyme = NULL;
iargs.pk_inn = -1.0;
iargs.pk_mid = -1.0;
@@ -269,7 +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},
+ {"cxi-hdf5-peaks", 0, &iargs.cxi_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 57bc9e3c..6ccd0c9a 100644
--- a/src/process_image.c
+++ b/src/process_image.c
@@ -180,7 +180,7 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs,
/* Get peaks from HDF5 */
if ( get_peaks(&image, hdfile, iargs->hdf5_peak_path,
- iargs->cxidb_hdf5_peaks, pargs->filename_p_e) ) {
+ iargs->cxi_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 891553e6..8dba8a85 100644
--- a/src/process_image.h
+++ b/src/process_image.h
@@ -64,7 +64,7 @@ struct index_args
struct beam_params *beam;
char *element;
char *hdf5_peak_path;
- int cxidb_hdf5_peaks;
+ int cxi_hdf5_peaks;
float pk_inn;
float pk_mid;
float pk_out;