Commit 7c030ab7 authored by Thomas White's avatar Thomas White Committed by Thomas White
Browse files

Make it the default to do the saturation correction

parent 0da8b0ef
......@@ -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;
}
......
......@@ -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},
......
......@@ -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}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment