aboutsummaryrefslogtreecommitdiff
path: root/src/indexamajig.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2010-03-18 11:05:41 +0100
committerThomas White <taw@physics.org>2010-03-18 11:05:41 +0100
commit88c08418710ab2c72d51f6fce13ad2d78e0706f6 (patch)
treea6e7451341a1bda9307c1c71eb77a1cae898699f /src/indexamajig.c
parent7678f34afc9df872af539d56c8110e578e683b08 (diff)
Separate CM subtraction and noise filter
Diffstat (limited to 'src/indexamajig.c')
-rw-r--r--src/indexamajig.c22
1 files changed, 15 insertions, 7 deletions
diff --git a/src/indexamajig.c b/src/indexamajig.c
index 7c227cb1..ac5fb0ae 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -49,6 +49,8 @@ static void show_help(const char *s)
" dirax : invoke DirAx\n"
"\n"
" --verbose Be verbose about indexing.\n"
+" --gpu Use the GPU to speed up the simulation.\n"
+"\n"
" --write-drx Write 'xfel.drx' for visualisation of reciprocal\n"
" space. Implied by any indexing method other than\n"
" 'none'. Beware: the units in this file are\n"
@@ -57,9 +59,13 @@ static void show_help(const char *s)
" --near-bragg Output a list of reflection intensities to stdout.\n"
" --simulate Simulate the diffraction pattern using the indexed\n"
" unit cell.\n"
-" --gpu Use the GPU to speed up the simulation.\n"
-" --clean-image Perform common-mode noise subtraction and\n"
-" background removal on images before proceeding.\n"
+" --filter-cm Perform common-mode noise subtraction on images\n"
+" before proceeding. Intensities will be extracted\n"
+" from the image as it is after this processing.\n"
+" --filter-noise Apply an aggressive noise filter which sets all\n"
+" pixels in each 3x3 region to zero if any of them\n"
+" have negative values. Intensity measurement will\n"
+" be performed on the image as it was before this.\n"
" --no-match Don't attempt to match the indexed cell to the\n"
" model, just proceed with the one generated by the\n"
" auto-indexing procedure.\n"
@@ -170,7 +176,8 @@ int main(int argc, char *argv[])
int config_nearbragg = 0;
int config_writedrx = 0;
int config_simulate = 0;
- int config_clean = 0;
+ int config_cmfilter = 0;
+ int config_noisefilter = 0;
int config_nomatch = 0;
int config_gpu = 0;
int config_verbose = 0;
@@ -190,7 +197,8 @@ int main(int argc, char *argv[])
{"write-drx", 0, &config_writedrx, 1},
{"indexing", 1, NULL, 'z'},
{"simulate", 0, &config_simulate, 1},
- {"clean-image", 0, &config_clean, 1},
+ {"filter-cm", 0, &config_cmfilter, 1},
+ {"filter-noise", 0, &config_noisefilter, 1},
{"no-match", 0, &config_nomatch, 1},
{"verbose", 0, &config_verbose, 1},
{"alternate", 0, &config_alternate, 1},
@@ -296,8 +304,8 @@ int main(int argc, char *argv[])
hdf5_read(hdfile, &image);
- if ( config_clean ) {
- clean_image(&image);
+ if ( config_cmfilter ) {
+ filter_cm(&image);
}
/* Perform 'fine' peak search */