diff --git a/pub/CHANGELOG b/pub/CHANGELOG index df1a152be8196eb8885de9a1732ef895695d4441..6e449051f2d8175447a9a135cf23c0dde99c82f0 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 488e0609b054fe6a217ca45546d4682b60d83193..aacea8f8a01bc84e3560bb7f57f035dc43cab1df 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]) )