diff options
| author | Thomas White <taw@physics.org> | 2015-03-10 15:13:20 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2015-03-12 16:37:25 +0100 |
| commit | 421ab04b10f996de0fb1d111e6750930e1ccc0c4 (patch) | |
| tree | 42d1f3757ae176290c81a10d69288b0c7b12f886 /src/hrs-scaling.c | |
| parent | 15da5f261530777072fa387724f2a5e506ef40ee (diff) | |
partialator: Add --start-params
Diffstat (limited to 'src/hrs-scaling.c')
| -rw-r--r-- | src/hrs-scaling.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/hrs-scaling.c b/src/hrs-scaling.c index 81c6536b..1c0281a4 100644 --- a/src/hrs-scaling.c +++ b/src/hrs-scaling.c @@ -352,8 +352,8 @@ static void finalise_merge_job(void *vqargs, void *vwargs) } -static RefList *lsq_intensities(Crystal **crystals, int n, int n_threads, - PartialityModel pmodel) +RefList *lsq_intensities(Crystal **crystals, int n, int n_threads, + PartialityModel pmodel) { RefList *full; struct merge_queue_args qargs; @@ -448,9 +448,8 @@ static int test_convergence(double *old_osfs, int n, Crystal **crystals) /* Scale the stack of images */ -RefList *scale_intensities(Crystal **crystals, int n, - int n_threads, int noscale, PartialityModel pmodel, - int min_redundancy) +RefList *scale_intensities(Crystal **crystals, int n, int n_threads, + PartialityModel pmodel, int min_redundancy) { int i; RefList *full = NULL; @@ -463,11 +462,6 @@ RefList *scale_intensities(Crystal **crystals, int n, crystal_set_Bfac(crystals[i], 0.0); } - if ( noscale ) { - full = lsq_intensities(crystals, n, n_threads, pmodel); - return full; - } - /* Create an initial list to refine against */ full = lsq_intensities(crystals, n, n_threads, pmodel); |