From 9190d440c20a4eefdd19aa04c04e08f1b976870d Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (office)" <j.wuttke@fz-juelich.de>
Date: Tue, 24 Mar 2009 19:35:42 +0100
Subject: [PATCH] corr; tempo: leasrt sqr^4 fits
---
src/curve.cpp | 4 ++--
src/dualplot.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/curve.cpp b/src/curve.cpp
index 94099461..fe3da1e0 100644
--- a/src/curve.cpp
+++ b/src/curve.cpp
@@ -388,11 +388,11 @@ void globalEvaluate( double* par, int m_dat, double* fvec,
for ( uint i=0; i<m_dat; i++) {
if (!fc->weight_y_log) {
fvec[i] = s->y[i] - fit[i];
-/*
+
fvec[i] *= fvec[i]; // TEMPORARY
fvec[i] *= fvec[i]; // TEMPORARY
fvec[i] *= fvec[i]; // TEMPORARY
-*/
+
} else {
if ( s->y[i] < 1e-99 || fit[i] < 1e-99 ) {
fvec[i] = 0; // just don't fit
diff --git a/src/dualplot.cpp b/src/dualplot.cpp
index 28338389..91ed3895 100644
--- a/src/dualplot.cpp
+++ b/src/dualplot.cpp
@@ -58,7 +58,7 @@ void CRange::set_from_string( const string& in )
if( s1=="*" ){
inf = -INFINITY;
} else {
- if (!mystd::any2dbl(s1,&inf)){
+ if ( mystd::any2dbl(s1,&inf) ){
inf = -INFINITY;
throw "invalid lower bound ["+s1+"], expecting real number or '*'";
}
@@ -66,7 +66,7 @@ void CRange::set_from_string( const string& in )
if( s2=="*" ){
sup = +INFINITY;
} else {
- if (!mystd::any2dbl(s2,&sup)){
+ if ( mystd::any2dbl(s2,&sup) ){
sup = +INFINITY;
throw "invalid upper bound ["+s2+"], expecting real number or '*'";
}
--
GitLab