diff options
| author | Thomas White <taw@physics.org> | 2009-11-26 12:39:59 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2009-11-26 12:39:59 +0100 |
| commit | 0aeafff34ab38c92df13d2c42dd583800737ef27 (patch) | |
| tree | 8daa11226b2a3c27341ccc8e0ecc7d1630460d52 /src | |
| parent | 844947d19261a2c71280b9f638ad7f5e88e16c73 (diff) | |
More moving around of constants
Diffstat (limited to 'src')
| -rw-r--r-- | src/detector.c | 7 | ||||
| -rw-r--r-- | src/diffraction.c | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/detector.c b/src/detector.c index 9f28a624..fbe2c5f2 100644 --- a/src/detector.c +++ b/src/detector.c @@ -29,8 +29,11 @@ /* Detector's saturation value */ #define SATURATION (60000) +/* Radius of the water column */ +#define WATER_RADIUS (2.0e-6 / 2.0) + /* Radius of X-ray beam */ -#define BEAM_RADIUS (3.0e-6) +#define BEAM_RADIUS (5.0e-6 / 2.0) /* Bleed excess intensity into neighbouring pixels */ @@ -173,7 +176,7 @@ void record_image(struct image *image) /* Add intensity contribution from water */ water = water_intensity(image->qvecs[x + image->width*y], image->xray_energy, - BEAM_RADIUS, 1.5e-6); + BEAM_RADIUS, WATER_RADIUS); //printf("%e, %e, ", intensity, water); intensity += water; diff --git a/src/diffraction.c b/src/diffraction.c index 10e12c4d..80232210 100644 --- a/src/diffraction.c +++ b/src/diffraction.c @@ -23,9 +23,6 @@ #include "diffraction.h" #include "sfac.h" -/* Radius of beam (m) */ -#define BEAM_RADIUS (1.5e-6) - static double lattice_factor(struct threevec q, double ax, double ay, double az, double bx, double by, double bz, |