From 8681a51c2cd6dc3f6f112a0a2f6a413825f96671 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Thu, 9 Nov 2017 16:45:00 +0100
Subject: Fix log scaling

---
 src/scaling.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/scaling.c b/src/scaling.c
index c7c608fe..960233aa 100644
--- a/src/scaling.c
+++ b/src/scaling.c
@@ -65,9 +65,9 @@ static void apply_shift(Crystal *cr, int k, double shift)
 		break;
 
 		case GPARAM_OSF :
-		t = crystal_get_osf(cr);
+		t = -log(crystal_get_osf(cr));
 		t += shift;
-		crystal_set_osf(cr, t);
+		crystal_set_osf(cr, exp(-t));
 		break;
 
 		default :
@@ -272,7 +272,7 @@ double log_residual(Crystal *cr, const RefList *full, int free,
 		if ( I_full <= 0 ) continue;  /* Because log */
 		if ( p <= 0.0 ) continue; /* Because of log */
 
-		fx = G + log(p) - log(L) - B*s*s + log(I_full);
+		fx = -log(G) + log(p) - log(L) - B*s*s + log(I_full);
 		dc = log(I_partial) - fx;
 		w = 1.0;
 		dev += w*dc*dc;
-- 
cgit v1.2.3