diff options
| author | Thomas White <taw@physics.org> | 2018-05-03 15:04:48 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2018-05-07 10:08:02 +0200 |
| commit | dbf546c4d511ce96f5eab4558442b932931e5e9f (patch) | |
| tree | 38d7edec9bcdc12912da0bdd000bb9835655c767 /src | |
| parent | d1a2c71235611ad878fa9bc705c6eff1a04b3600 (diff) | |
Pass scaling flags down
Diffstat (limited to 'src')
| -rw-r--r-- | src/scaling.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/scaling.c b/src/scaling.c index 29b0c2b4..c708e7d3 100644 --- a/src/scaling.c +++ b/src/scaling.c @@ -52,6 +52,7 @@ struct scale_args { RefList *full; Crystal *crystal; + int flags; }; @@ -78,7 +79,7 @@ static void scale_crystal(void *task, int id) do { double dev; - scale_one_crystal(pargs->crystal, pargs->full, 0); + scale_one_crystal(pargs->crystal, pargs->full, pargs->flags); dev = log_residual(pargs->crystal, pargs->full, 0, 0, NULL); if ( fabs(dev - old_dev) < dev*0.01 ) done = 1; @@ -136,7 +137,7 @@ static double total_log_r(Crystal **crystals, int n_crystals, RefList *full, /* Perform iterative scaling, all the way to convergence */ -void scale_all(Crystal **crystals, int n_crystals, int nthreads, int no_Bscale) +void scale_all(Crystal **crystals, int n_crystals, int nthreads, int scaleflags) { struct scale_args task_defaults; struct queue_args qargs; @@ -144,6 +145,7 @@ void scale_all(Crystal **crystals, int n_crystals, int nthreads, int no_Bscale) int niter = 0; task_defaults.crystal = NULL; + task_defaults.flags = scaleflags; qargs.task_defaults = task_defaults; qargs.n_crystals = n_crystals; |