From b832e3564f7e019dfb3c275621ea4cfdae925375 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Fri, 9 Mar 2012 16:15:26 +0100
Subject: Updates for ADU per eV

---
 libcrystfel/src/peaks.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'libcrystfel')

diff --git a/libcrystfel/src/peaks.c b/libcrystfel/src/peaks.c
index 88497db5..a5b0e907 100644
--- a/libcrystfel/src/peaks.c
+++ b/libcrystfel/src/peaks.c
@@ -169,20 +169,14 @@ int integrate_peak(struct image *image, int cfs, int css,
 	double bg_mean, bg_var;
 	double bg_tot_sq = 0.0;
 	double var;
-	struct beam_params *beam;
 	double aduph;
 
-	beam = image->beam;
-	if ( beam != NULL ) {
-		aduph = image->beam->adu_per_photon;
-	} else {
-		aduph = 1.0;
-	}
-
 	p = find_panel(image->det, cfs, css);
 	if ( p == NULL ) return 1;
 	if ( p->no_index ) return 1;
 
+	aduph = p->adu_per_eV * ph_lambda_to_eV(image->lambda);
+
 	lim = p->integr_radius;
 	mid_lim = 3.0 + lim;
 	out_lim = 6.0 + lim;
-- 
cgit v1.2.3