aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2013-11-19 17:44:48 +0100
committerThomas White <taw@physics.org>2013-11-23 02:52:51 -0800
commit46a290bfc8de65bef253f8516e13b3ca09698caa (patch)
tree34a89c391945ecba735532bf060096fc1dec9c29
parent6bea65d5b69abf1ee5cffc13d9757a1c1f041078 (diff)
Move debugging output
-rw-r--r--libcrystfel/src/integration.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/libcrystfel/src/integration.c b/libcrystfel/src/integration.c
index 7046e109..a118384a 100644
--- a/libcrystfel/src/integration.c
+++ b/libcrystfel/src/integration.c
@@ -1564,12 +1564,6 @@ static void integrate_rings_once(Reflection *refl, struct image *image,
intensity = tentative_intensity(ic, bx);
mean_var_area(ic, bx, BM_BG, &bgmean, &sig2_bg);
- mean_var_area(ic, bx, BM_PK, &pkmean, &sig2_pk);
- if ( bx->verbose ) {
- STATUS("bg mean, var = %.2f, %.2f\n", bgmean, sig2_bg);
- STATUS("pk mean, var = %.2f, %.2f\n", pkmean, sig2_pk);
- }
-
aduph = bx->p->adu_per_eV * ph_lambda_to_eV(ic->image->lambda);
sig2_poisson = aduph * intensity;
@@ -1595,6 +1589,13 @@ static void integrate_rings_once(Reflection *refl, struct image *image,
sigma = sqrt(sig2_poisson + bx->m*sig2_bg);
+ mean_var_area(ic, bx, BM_PK, &pkmean, &sig2_pk);
+ if ( bx->verbose ) {
+ STATUS("bg mean, var = %.2f, %.2f\n", bgmean, sig2_bg);
+ STATUS("pk mean, var = %.2f, %.2f\n", pkmean, sig2_pk);
+ STATUS("intensity = %.2f +/- %.2f\n", intensity, sigma);
+ }
+
if ( intensity < -5.0*sigma ) {
delete_box(ic, bx);
ic->n_implausible++;