Commit ef9281fb authored by Thomas White's avatar Thomas White
Browse files

Remove 'xray_energy' to leave a single point of truth for wavelength

parent 59e333ee
......@@ -153,7 +153,7 @@ void record_image(struct image *image, int do_water, int do_poisson,
/* How many photons are scattered per electron? */
area = M_PI*pow(BEAM_RADIUS, 2.0);
total_energy = FLUENCE * image->xray_energy;
total_energy = FLUENCE * ph_lambda_to_en(image->lambda);
energy_density = total_energy / area;
ph_per_e = (FLUENCE/area) * pow(THOMSON_LENGTH, 2.0);
STATUS("Fluence = %8.2e photons, "
......@@ -183,7 +183,7 @@ void record_image(struct image *image, int do_water, int do_poisson,
/* Add intensity contribution from water */
water = water_intensity(image->qvecs[x + image->width*y],
image->xray_energy,
ph_lambda_to_en(image->lambda),
BEAM_RADIUS, WATER_RADIUS);
intensity += water;
......
......@@ -162,7 +162,8 @@ void get_diffraction(struct image *image, int na, int nb, int nc)
* sizeof(double complex));
if ( image->molecule->reflections == NULL ) {
get_reflections_cached(image->molecule, image->xray_energy);
get_reflections_cached(image->molecule,
ph_lambda_to_en(image->lambda));
}
for ( x=0; x<image->width; x++ ) {
......
......@@ -91,8 +91,6 @@ struct image {
/* Wavelength must always be given */
double lambda; /* Wavelength in m */
double xray_energy; /* X-ray energy
* in J (per photon) */
int width;
int height;
......
......@@ -217,8 +217,7 @@ int main(int argc, char *argv[])
image.y_centre = 512.5;
image.camera_len = 0.05; /* 5 cm (front CCD can move from 5cm-20cm) */
image.resolution = 13333.3; /* 75 micron pixel size */
image.xray_energy = eV_to_J(2.0e3); /* 2 keV energy */
image.lambda = ph_en_to_lambda(image.xray_energy); /* Wavelength */
image.lambda = ph_en_to_lambda(eV_to_J(2.0e3)); /* Wavelength */
image.molecule = NULL;
/* Splurge a few useful numbers */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment