From dee19af3c1b079297efc75c437e261412fb33cf6 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Fri, 6 Nov 2015 14:15:45 +0100
Subject: [PATCH] corr curve variance for pconv
---
pub/CHANGELOG | 6 ++++++
pub/lib/node.cpp | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/pub/CHANGELOG b/pub/CHANGELOG
index df1a152b..6e449051 100644
--- a/pub/CHANGELOG
+++ b/pub/CHANGELOG
@@ -1,3 +1,9 @@
+Release 2.3.2d of
+
+- Bug fix:
+ - correct variance weighing for pconv
+ - catch exception from curve evaluation within global fit
+
Release 2.3.2c of 2nov15:
- Bug fix:
diff --git a/pub/lib/node.cpp b/pub/lib/node.cpp
index 488e0609..aacea8f8 100644
--- a/pub/lib/node.cpp
+++ b/pub/lib/node.cpp
@@ -1222,7 +1222,7 @@ RObjVecDbl CNodePConv::convolve( const CContext& ctx, double theshift, const RSp
double igral = res_theory->to_r(nv+i-iv) - res_theory->to_r(nv-1+i-iv);
ret->v[i] += igral * sv->y[iv];
if( dret )
- dret->dv[i] += igral * SQR(sv->dy[iv]);
+ dret->dv[i] += SQR(igral * sv->dy[iv]);
}
ret->v[i] /= conv_norm;
if ( !std::isfinite(ret->v[i]) )
--
GitLab