aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2012-05-21 15:52:06 +0200
committerThomas White <taw@physics.org>2012-05-21 15:52:06 +0200
commit934e9aeee2232692f289ef0faef2280017617d80 (patch)
treeaf2afda4dc60a02396395a174f67de8a2f5eaeb9 /libcrystfel/src
parent4aa325f2d840d8a2d0eeaff3d0c72bab39b51b5e (diff)
ADU limit in peak integration
Diffstat (limited to 'libcrystfel/src')
-rw-r--r--libcrystfel/src/detector.c3
-rw-r--r--libcrystfel/src/detector.h1
-rw-r--r--libcrystfel/src/peaks.c6
3 files changed, 10 insertions, 0 deletions
diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c
index 94af656f..06ef3a36 100644
--- a/libcrystfel/src/detector.c
+++ b/libcrystfel/src/detector.c
@@ -606,6 +606,8 @@ static int parse_field_for_panel(struct panel *panel, const char *key,
panel->coffset = atof(val);
} else if ( strcmp(key, "res") == 0 ) {
panel->res = atof(val);
+ } else if ( strcmp(key, "max_adu") == 0 ) {
+ panel->max_adu = atof(val);
} else if ( strcmp(key, "peak_sep") == 0 ) {
panel->peak_sep = atof(val);
} else if ( strcmp(key, "badrow_direction") == 0 ) {
@@ -743,6 +745,7 @@ struct detector *get_detector_geometry(const char *filename)
det->defaults.ssy = 1.0;
det->defaults.rigid_group = NULL;
det->defaults.adu_per_eV = NAN;
+ det->defaults.max_adu = +INFINITY;
strncpy(det->defaults.name, "", 1023);
do {
diff --git a/libcrystfel/src/detector.h b/libcrystfel/src/detector.h
index 02d66cd4..2b4ac5c6 100644
--- a/libcrystfel/src/detector.h
+++ b/libcrystfel/src/detector.h
@@ -65,6 +65,7 @@ struct panel
double peak_sep; /* Characteristic peak separation */
char *rigid_group; /* Rigid group, or -1 for none */
double adu_per_eV; /* Number of ADU per eV */
+ double max_adu; /* Treat pixel as unreliable if higher than this */
double fsx;
double fsy;
diff --git a/libcrystfel/src/peaks.c b/libcrystfel/src/peaks.c
index 78a68185..91a8c949 100644
--- a/libcrystfel/src/peaks.c
+++ b/libcrystfel/src/peaks.c
@@ -211,6 +211,9 @@ static int integrate_peak(struct image *image, int cfs, int css,
val = image->data[idx];
+ /* Veto peak if it contains saturation in bg region */
+ if ( val > p->max_adu ) return 1;
+
bg_tot += val;
bg_tot_sq += pow(val, 2.0);
bg_counts++;
@@ -259,6 +262,9 @@ static int integrate_peak(struct image *image, int cfs, int css,
val = image->data[idx] - bg_mean;
+ /* Veto peak if it contains saturation */
+ if ( val > p->max_adu ) return 1;
+
pk_counts++;
pk_total += val;