diff options
| author | Thomas White <taw@physics.org> | 2012-05-30 11:21:31 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-05-30 11:21:31 +0200 |
| commit | 6ff1bbbd0deeac54175fc862a6e1b53374ae6306 (patch) | |
| tree | b7fc5ed3201a27691598ac2d7a095189bdec6a2c /libcrystfel | |
| parent | fd647af47d1fe8fddc7e0c72c43bfdd31eaa2129 (diff) | |
| parent | 3ff6058ee1e87b9f0730aa42b9c1961f1d754976 (diff) | |
Merge branch 'master' into tom/speed
Diffstat (limited to 'libcrystfel')
| -rw-r--r-- | libcrystfel/src/detector.c | 4 | ||||
| -rw-r--r-- | libcrystfel/src/detector.h | 1 | ||||
| -rw-r--r-- | libcrystfel/src/peaks.c | 6 |
3 files changed, 11 insertions, 0 deletions
diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c index 94af656f..b7d809df 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 { @@ -1254,6 +1257,7 @@ int write_detector_geometry(const char *filename, struct detector *det) fprintf(fh, "%s/corner_x = %g\n", p->name, p->cnx); fprintf(fh, "%s/corner_y = %g\n", p->name, p->cny); fprintf(fh, "%s/adu_per_eV = %g\n", p->name, p->adu_per_eV); + fprintf(fh, "%s/max_adu = %g\n", p->name, p->max_adu); if ( p->no_index ) { fprintf(fh, "%s/no_index = 1\n", p->name); 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 dac1a96e..583dff4c 100644 --- a/libcrystfel/src/peaks.c +++ b/libcrystfel/src/peaks.c @@ -210,6 +210,9 @@ 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++; @@ -258,6 +261,9 @@ int integrate_peak(struct image *image, int cfs, int css, val = image->data[idx] - bg_mean; + /* Veto peak if it contains saturation */ + if ( image->data[idx] > p->max_adu ) return 1; + pk_counts++; pk_total += val; |