From 43dd295f946c96fced794e5c6ed14d352aad3179 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 10 Mar 2022 08:20:38 +0000 Subject: [PATCH] data plots compatible with multi-column arrays --- lib/Core/Plot.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/Core/Plot.cpp b/lib/Core/Plot.cpp index 42848ed..3a236cd 100644 --- a/lib/Core/Plot.cpp +++ b/lib/Core/Plot.cpp @@ -122,10 +122,10 @@ PlotData::PlotData(const DMatSample &x, const DMatSample &y, const bool abs) DMat d(x[central].rows(), 4); string usingCmd, tmpFileName; - d.col(0) = x[central]; - d.col(2) = y[central]; - d.col(1) = x.variance().cwiseSqrt(); - d.col(3) = y.variance().cwiseSqrt(); + d.col(0) = x[central].col(0); + d.col(2) = y[central].col(0); + d.col(1) = x.variance().cwiseSqrt().col(0); + d.col(3) = y.variance().cwiseSqrt().col(0); tmpFileName = dumpToTmpFile(d); pushTmpFile(tmpFileName); if (!abs) @@ -149,8 +149,8 @@ PlotData::PlotData(const DVec &x, const DMatSample &y, const bool abs) string usingCmd, tmpFileName; d.col(0) = x; - d.col(1) = y[central]; - d.col(2) = y.variance().cwiseSqrt(); + d.col(1) = y[central].col(0); + d.col(2) = y.variance().cwiseSqrt().col(0); tmpFileName = dumpToTmpFile(d); pushTmpFile(tmpFileName); if (!abs) @@ -173,9 +173,9 @@ PlotData::PlotData(const DMatSample &x, const DVec &y, const bool abs) DMat d(x[central].rows(), 3), xerr, yerr; string usingCmd, tmpFileName; - d.col(0) = x[central]; + d.col(0) = x[central].col(0); d.col(2) = y; - d.col(1) = x.variance().cwiseSqrt(); + d.col(1) = x.variance().cwiseSqrt().col(0); tmpFileName = dumpToTmpFile(d); pushTmpFile(tmpFileName); if (!abs)