aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2012-02-29 16:02:21 +0100
committerThomas White <taw@physics.org>2012-02-29 16:02:21 +0100
commitf09527699de496a1079bd9063f2356677afe0c68 (patch)
tree1bd85ce055e1ec56d364c090f1e1f7873bd2b655 /libcrystfel/src
parentf627677af3147a29a6915f60f009e30dc674ec2c (diff)
Fix bug in peak integration ESD calculation
Diffstat (limited to 'libcrystfel/src')
-rw-r--r--libcrystfel/src/peaks.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcrystfel/src/peaks.c b/libcrystfel/src/peaks.c
index fa765b65..55abff27 100644
--- a/libcrystfel/src/peaks.c
+++ b/libcrystfel/src/peaks.c
@@ -247,9 +247,9 @@ int integrate_peak(struct image *image, int cfs, int css,
/* Noise
* noise and noise_meansq are both in photons (^2) */
- noise += val / image->beam->adu_per_photon;
+ noise += val / aduph;
noise_counts++;
- noise_meansq += pow(val, 2.0);
+ noise_meansq += pow(val/aduph, 2.0);
} else if ( fs*fs + ss*ss < lim_sq ) {