aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2013-03-15 11:30:47 +0100
committerThomas White <taw@physics.org>2013-04-17 17:33:49 +0200
commit101aa5f9f8290b1d180d04d6ab5ff7eac934c148 (patch)
tree63dbc6fdf79afe12c2c9f3b57274c52bbc581859 /src
parent454b01b732b98a0b1cddbd85f91df64560416494 (diff)
partial_sim: Add --osf-stddev
Diffstat (limited to 'src')
-rw-r--r--src/partial_sim.c34
1 files changed, 29 insertions, 5 deletions
diff --git a/src/partial_sim.c b/src/partial_sim.c
index 32e6666a..615c66a3 100644
--- a/src/partial_sim.c
+++ b/src/partial_sim.c
@@ -3,11 +3,11 @@
*
* Generate partials for testing scaling
*
- * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY,
- * a research centre of the Helmholtz Association.
+ * Copyright © 2012-2013 Deutsches Elektronen-Synchrotron DESY,
+ * a research centre of the Helmholtz Association.
*
* Authors:
- * 2011-2012 Thomas White <taw@physics.org>
+ * 2011-2013 Thomas White <taw@physics.org>
*
* This file is part of CrystFEL.
*
@@ -184,6 +184,7 @@ static void show_help(const char *s)
" -c, --cnoise=<val> Add random noise, with a flat distribution, to the\n"
" reciprocal lattice vector components given in the\n"
" stream, with maximum error +/- <val> percent.\n"
+" --osf-stddev=<val> Set the standard deviation of the scaling factors.\n"
"\n"
);
}
@@ -202,6 +203,7 @@ struct queue_args
int random_intensities;
UnitCell *cell;
double cnoise;
+ double osf_stddev;
struct image *template_image;
double max_q;
@@ -255,6 +257,7 @@ static void run_job(void *vwargs, int cookie)
int i;
Crystal *cr;
RefList *reflections;
+ double osf;
cr = crystal_new();
if ( cr == NULL ) {
@@ -264,7 +267,10 @@ static void run_job(void *vwargs, int cookie)
wargs->crystal = cr;
crystal_set_image(cr, &wargs->image);
- crystal_set_osf(cr, gaussian_noise(1.0, 0.3));
+ do {
+ osf = gaussian_noise(1.0, qargs->osf_stddev);
+ } while ( osf <= 0.0 );
+ crystal_set_osf(cr, osf);
crystal_set_profile_radius(cr, wargs->image.beam->profile_radius);
/* Set up a random orientation */
@@ -344,6 +350,7 @@ int main(int argc, char *argv[])
int i;
FILE *fh;
char *phist_file = NULL;
+ double osf_stddev = 2.0;
/* Long options */
const struct option longopts[] = {
@@ -355,8 +362,11 @@ int main(int argc, char *argv[])
{"geometry", 1, NULL, 'g'},
{"symmetry", 1, NULL, 'y'},
{"save-random", 1, NULL, 'r'},
- {"pgraph", 1, NULL, 2},
{"cnoise", 1, NULL, 'c'},
+
+ {"pgraph", 1, NULL, 2},
+ {"osf-stddev", 1, NULL, 3},
+
{0, 0, NULL, 0}
};
@@ -418,6 +428,19 @@ int main(int argc, char *argv[])
phist_file = strdup(optarg);
break;
+ case 3 :
+ osf_stddev = strtod(optarg, &rval);
+ if ( *rval != '\0' ) {
+ ERROR("Invalid OSF standard deviation.\n");
+ return 1;
+ }
+ if ( osf_stddev <= 0.0 ) {
+ ERROR("Invalid OSF standard deviation.");
+ ERROR(" (must be positive).\n");
+ return 1;
+ }
+ break;
+
case 0 :
break;
@@ -549,6 +572,7 @@ int main(int argc, char *argv[])
qargs.template_image = &image;
qargs.stream = stream;
qargs.cnoise = cnoise;
+ qargs.osf_stddev = osf_stddev;
qargs.max_q = largest_q(&image);
for ( i=0; i<NBINS; i++ ) {