diff options
| author | Thomas White <taw@physics.org> | 2010-10-25 16:00:23 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:03 +0100 |
| commit | 380ec553c04576fc3dc4c816127078d3c2cf9e32 (patch) | |
| tree | 7f2e4a384bf1ed2285c15817fbbfe46c1add1d64 /src/diffraction.c | |
| parent | a1408ca8460ef486730b4e5ce11cfca2504edf3b (diff) | |
Read beam parameters from file (where appropriate)
Diffstat (limited to 'src/diffraction.c')
| -rw-r--r-- | src/diffraction.c | 5 |
1 files changed, 3 insertions, 2 deletions
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; } |