diff options
| author | Thomas White <taw@physics.org> | 2011-09-29 15:41:17 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:38 +0100 |
| commit | e872c19300aa50169a76bc95f215fe67c358a1a8 (patch) | |
| tree | 125c0def352ed8d2f4831557412005734967a14f /src/hrs-scaling.c | |
| parent | 27db5b4cd6791bd4c181bbfd21f1dd64ef63e727 (diff) | |
New scaling procedure
Diffstat (limited to 'src/hrs-scaling.c')
| -rw-r--r-- | src/hrs-scaling.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/hrs-scaling.c b/src/hrs-scaling.c index 5cb53cda..8cf5e8b8 100644 --- a/src/hrs-scaling.c +++ b/src/hrs-scaling.c @@ -52,7 +52,8 @@ static double iterate_scale(struct image *images, int n, RefList *reference) RefListIterator *iter; double num = 0.0; double den = 0.0; - double corr; + double new_sf; + double corr = 0.0; if ( image->pr_dud ) continue; @@ -61,7 +62,7 @@ static double iterate_scale(struct image *images, int n, RefList *reference) refl = next_refl(refl, iter) ) { signed int h, k, l; - double Ih, Ihl, esd; + double Ih, Ihl; Reflection *r; if ( !get_scalable(refl) ) continue; @@ -80,21 +81,18 @@ static double iterate_scale(struct image *images, int n, RefList *reference) } Ihl = get_intensity(refl) / get_partiality(refl); - esd = get_esd_intensity(refl) / get_partiality(refl); - num += Ih * (Ihl/image->osf) / pow(esd/image->osf, 2.0); - den += pow(Ih, 2.0)/pow(esd/image->osf, 2.0); + num += Ih * Ihl; + den += Ihl * Ihl; } - //num += image->osf / pow(SCALING_RESTRAINT, 2.0); - //den += pow(image->osf, 2.0)/pow(SCALING_RESTRAINT, 2.0); - - corr = num / den; - if ( !isnan(corr) && !isinf(corr) ) { - image->osf *= corr; + new_sf = num / den; + if ( !isnan(new_sf) && !isinf(new_sf) ) { + corr = image->osf - new_sf; + image->osf = new_sf; } - if ( fabs(corr-1.0) > max_shift ) max_shift = fabs(corr-1.0); + if ( fabs(corr) > max_shift ) max_shift = fabs(corr); } |