aboutsummaryrefslogtreecommitdiff
path: root/src/hrs-scaling.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2015-05-15 16:06:06 +0200
committerThomas White <taw@physics.org>2015-05-19 13:57:52 +0200
commit45475fd360e966ca85dc11fd8f15307073f767ab (patch)
treeb135c5c150e6f8f0967f3627c7aa02876d6dfdb0 /src/hrs-scaling.c
parent6a9185eedebc6c2002b7d6ca2467d5e6a7f245f0 (diff)
More debugging / logarithm stuff
Diffstat (limited to 'src/hrs-scaling.c')
-rw-r--r--src/hrs-scaling.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/hrs-scaling.c b/src/hrs-scaling.c
index 2a50d06a..f5067ea9 100644
--- a/src/hrs-scaling.c
+++ b/src/hrs-scaling.c
@@ -328,11 +328,11 @@ static void run_merge_job(void *vwargs, int cookie)
res = resolution(crystal_get_cell(cr), h, k, l);
/* Total (multiplicative) correction factor */
- corr = exp(2.0*B*res*res) * get_lorentz(refl)
- / (G * get_partiality(refl));
+ corr = exp(-G) * exp(B*res*res) * get_lorentz(refl)
+ / get_partiality(refl);
- esd = fabs(get_esd_intensity(refl) * corr);
- w = 1.0 / pow(esd, 0.5);
+ esd = get_esd_intensity(refl) * corr;
+ w = 1.0;
/* Running mean and variance calculation */
temp = w + sumweight;