diff options
| author | Andrew Martin <andrew.martin@desy.de> | 2011-06-06 18:26:32 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:28 +0100 |
| commit | 0e2394a8cd805837122fa18c25f7687f5834c6dd (patch) | |
| tree | f55fdafd4e0a94d14e163ac27b593e929556a1d7 | |
| parent | 174efddd7d70baada39d933c77bc568267ba115f (diff) | |
add 3 ring background estimate; change default integration radius to 3
| -rw-r--r-- | src/detector.c | 2 | ||||
| -rw-r--r-- | src/peaks.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/detector.c b/src/detector.c index ce62d72b..e9fdecfe 100644 --- a/src/detector.c +++ b/src/detector.c @@ -666,7 +666,7 @@ struct detector *get_detector_geometry(const char *filename) det->defaults.badrow = '-'; det->defaults.no_index = 0; det->defaults.peak_sep = 50.0; - det->defaults.integr_radius = 10.0; + det->defaults.integr_radius = 3.0; det->defaults.fsx = 1.0; det->defaults.fsy = 0.0; det->defaults.ssx = 0.0; diff --git a/src/peaks.c b/src/peaks.c index 35a8cd23..2879919e 100644 --- a/src/peaks.c +++ b/src/peaks.c @@ -165,8 +165,8 @@ int integrate_peak(struct image *image, int cfs, int css, if ( p->no_index ) return 1; lim = p->integr_radius; - mid_lim = 2.0 + lim; - out_lim = 4.0 + lim; + mid_lim = 3.0 + lim; + out_lim = 6.0 + lim; lim_sq = pow(lim, 2.0); mid_lim_sq = pow(mid_lim, 2.0); out_lim_sq = pow(out_lim, 2.0); @@ -247,6 +247,7 @@ int integrate_peak(struct image *image, int cfs, int css, noise_mean = noise / noise_counts; /* The centroid is excitingly undefined if there is no intensity */ + centroid = 0; if ( centroid && (total != 0) ) { *pfs = ((double)fsct / total) + 0.5; *pss = ((double)ssct / total) + 0.5; |