diff options
| author | Thomas White <taw@physics.org> | 2011-03-01 15:07:59 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:16 +0100 |
| commit | 43337144f55e73426f2c6a2f33f12e45117da1a6 (patch) | |
| tree | da79ab3216ee47e74cf4874c6155d573aeda5bda /src/pattern_sim.c | |
| parent | 243e7220f23be883826d53b3170a27da84c8a951 (diff) | |
Remove water simulation stuff
It's not really useful - our dominant background is from elsewhere
Diffstat (limited to 'src/pattern_sim.c')
| -rw-r--r-- | src/pattern_sim.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/pattern_sim.c b/src/pattern_sim.c index fe6a8f0d..29e1b263 100644 --- a/src/pattern_sim.c +++ b/src/pattern_sim.c @@ -97,7 +97,6 @@ static void show_help(const char *s) "speed, or for testing, you can choose to disable certain things using the\n" "following options.\n" "\n" -" --no-water Do not simulate water background.\n" " --no-noise Do not calculate Poisson noise.\n" ); } @@ -124,10 +123,6 @@ static void show_details() "This can be approximated to varying levels of accuracy by the methods given by\n" "the '--gradients' option.\n" "\n" -"Intensity from water is added according to the first term of equation 5\n" -"from Phys Chem Chem Phys 2003 (5) 1981--1991. This simulates the\n" -"coherent, elastic part of the diffuse scattering from the water jet only.\n" -"\n" "Expected intensities at the CCD are then calculated using:\n" "\n" "I(q) = I0 * r^2 * I_latt(q) * I_mol(q) * S\n" @@ -208,7 +203,6 @@ int main(int argc, char *argv[]) int config_nearbragg = 0; int config_randomquat = 0; int config_noimages = 0; - int config_nowater = 0; int config_nonoise = 0; int config_nosfac = 0; int config_gpu = 0; @@ -241,7 +235,6 @@ int main(int argc, char *argv[]) {"random-orientation", 0, NULL, 'r'}, {"number", 1, NULL, 'n'}, {"no-images", 0, &config_noimages, 1}, - {"no-water", 0, &config_nowater, 1}, {"no-noise", 0, &config_nonoise, 1}, {"intensities", 1, NULL, 'i'}, {"symmetry", 1, NULL, 'y'}, @@ -375,12 +368,6 @@ int main(int argc, char *argv[]) return 0; } - if ( (!config_nowater) && config_gpu ) { - ERROR("Cannot simulate water scattering on the GPU.\n"); - ERROR("Please try again with the --no-water option.\n"); - return 1; - } - if ( grad_str == NULL ) { STATUS("You didn't specify a gradient calculation method, so" " I'm using the 'mosaic' method, which is fastest.\n"); @@ -553,8 +540,7 @@ int main(int argc, char *argv[]) get_diffraction_gpu(gctx, &image, na, nb, nc, cell); } else { get_diffraction(&image, na, nb, nc, intensities, phases, - flags, cell, !config_nowater, grad, - sym); + flags, cell, grad, sym); } if ( image.data == NULL ) { ERROR("Diffraction calculation failed.\n"); |