From 380ec553c04576fc3dc4c816127078d3c2cf9e32 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 25 Oct 2010 16:00:23 +0200 Subject: Read beam parameters from file (where appropriate) --- src/diffraction.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/diffraction.c') diff --git a/src/diffraction.c b/src/diffraction.c index aea47035..00a73b94 100644 --- a/src/diffraction.c +++ b/src/diffraction.c @@ -22,7 +22,7 @@ #include "cell.h" #include "diffraction.h" #include "sfac.h" -#include "parameters.tmp" +#include "beam-parameters.h" #define SAMPLING (4) @@ -374,7 +374,8 @@ void get_diffraction(struct image *image, int na, int nb, int nc, /* Add intensity contribution from water */ image->data[x + image->width*y] += water_diffraction(q, ph_lambda_to_en(image->lambda), - BEAM_RADIUS, WATER_RADIUS) * sw; + image->beam->beam_radius, + image->beam->water_radius) * sw; } -- cgit v1.2.3