diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2010-09-29 22:32:34 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:00 +0100 |
| commit | 7c030ab77c830ab4e7a679f314fa413d126cea27 (patch) | |
| tree | de58bc1037410996af641c9466b86ae83867bb59 | |
| parent | 0da8b0efa29a1d581a15ffacafec5e1e5dec76ea (diff) | |
Make it the default to do the saturation correction
| -rw-r--r-- | src/hdf5-file.c | 2 | ||||
| -rw-r--r-- | src/indexamajig.c | 9 | ||||
| -rw-r--r-- | src/reintegrate.c | 7 |
3 files changed, 11 insertions, 7 deletions
diff --git a/src/hdf5-file.c b/src/hdf5-file.c index 09e9c91f..503065a0 100644 --- a/src/hdf5-file.c +++ b/src/hdf5-file.c @@ -243,6 +243,8 @@ static void debodge_saturation(struct hdfile *f, struct image *image) H5P_DEFAULT); if ( dh < 0 ) { + /* This isn't an error */ + STATUS("No saturation table found.\n"); return; } diff --git a/src/indexamajig.c b/src/indexamajig.c index 9abb481d..28a644ee 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -145,8 +145,8 @@ static void show_help(const char *s) " have negative values. Intensity measurement will\n" " be performed on the image as it was before this.\n" " --unpolarized Don't correct for the polarisation of the X-rays.\n" -" --sat-corr Correct values of saturated peaks using a table\n" -" included in the HDF5 file.\n" +" --no-sat-corr Don't correct values of saturated peaks using a\n" +" table included in the HDF5 file.\n" " --no-sa Don't correct for the differing solid angles of\n" " the pixels.\n" " --threshold=<n> Only accept peaks above <n> ADU. Default: 800.\n" @@ -476,7 +476,7 @@ int main(int argc, char *argv[]) int config_alternate = 0; int config_polar = 1; int config_sanity = 0; - int config_satcorr = 0; + int config_satcorr = 1; int config_sa = 1; int config_checkprefix = 1; int config_closer = 1; @@ -523,7 +523,8 @@ int main(int argc, char *argv[]) {"prefix", 1, NULL, 'x'}, {"unpolarized", 0, &config_polar, 0}, {"check-sanity", 0, &config_sanity, 1}, - {"sat-corr", 0, &config_satcorr, 1}, + {"no-sat-corr", 0, &config_satcorr, 0}, + {"sat-corr", 0, &config_satcorr, 1}, /* Compat */ {"no-sa", 0, &config_sa, 0}, {"threshold", 1, NULL, 't'}, {"no-check-prefix", 0, &config_checkprefix, 0}, diff --git a/src/reintegrate.c b/src/reintegrate.c index a278a3ec..673f3bc2 100644 --- a/src/reintegrate.c +++ b/src/reintegrate.c @@ -77,8 +77,8 @@ static void show_help(const char *s) " before proceeding. Intensities will be extracted\n" " from the image as it is after this processing.\n" " --unpolarized Don't correct for the polarisation of the X-rays.\n" -" --sat-corr Correct values of saturated peaks using a table\n" -" included in the HDF5 file.\n" +" --no-sat-corr Don't correct values of saturated peaks using a\n" +" table included in the HDF5 file.\n" " --no-sa Don't correct for the differing solid angles of\n" " the pixels.\n" " --no-closer-peak Don't integrate from the location of a nearby peak\n" @@ -336,7 +336,7 @@ int main(int argc, char *argv[]) int config_closer = 1; int config_polar = 1; int config_sanity = 0; - int config_satcorr = 0; + int config_satcorr = 1; int config_sa = 1; int config_cmfilter = 0; struct detector *det; @@ -353,6 +353,7 @@ int main(int argc, char *argv[]) {"unpolarized", 0, &config_polar, 0}, {"check-sanity", 0, &config_sanity, 1}, {"sat-corr", 0, &config_satcorr, 1}, + {"no-sat-corr", 0, &config_satcorr, 0}, {"no-sa", 0, &config_sa, 0}, {"filter-cm", 0, &config_cmfilter, 1}, {0, 0, NULL, 0} |