diff --git a/Device/Data/Datafield.cpp b/Device/Data/Datafield.cpp
index c48e9180ebe693af61161277cf52c60b43ac2c8e..ec3ff9ce293028aed2b612c3a3a7a45335a0fb24 100644
--- a/Device/Data/Datafield.cpp
+++ b/Device/Data/Datafield.cpp
@@ -59,12 +59,10 @@ Datafield::Datafield(const std::vector<IAxis*>& axes, const std::vector<double>&
}
Datafield::~Datafield() {}
-#include <iostream>
+
Datafield* Datafield::clone() const
{
-// std::cout << "OLD m_errSigmas.size() " << m_errSigmas.size() << " " << this << std::endl;
Datafield* data = new Datafield(m_frame->cloned_axes(), m_values, m_errSigmas);
-// std::cout << "NEW m_errSigmas.size() " << data->m_errSigmas.size() << " " << data << std::endl;
return data;
}
@@ -83,9 +81,9 @@ bool Datafield::hasErrorSigmas() const
return m_errSigmas.size()>0;
}
-double Datafield::errorSigmaAt(size_t i) const
+const std::vector<double> &Datafield::errorSigmas() const
{
- return m_errSigmas[i];
+ return m_errSigmas;
}
void Datafield::setAllTo(const double& value)
diff --git a/Device/Data/Datafield.h b/Device/Data/Datafield.h
index 337149514c50e247d68a66f30109b8d1d0d758b2..922fe424e2d417b350ed72850cd9e94c7b7876e7 100644
--- a/Device/Data/Datafield.h
+++ b/Device/Data/Datafield.h
@@ -53,7 +53,7 @@ public:
double valAt(size_t i) const;
bool hasErrorSigmas() const;
- double errorSigmaAt(size_t i) const;
+ const std::vector<double>& errorSigmas() const;
// retrieve basic info
diff --git a/Device/Detector/IDetector.cpp b/Device/Detector/IDetector.cpp
index 21e9a7a1e7264fa29cd98848ed72af085854af33..7d34089d0f6ca311fe339f4f1b077a7aa3418448 100644
--- a/Device/Detector/IDetector.cpp
+++ b/Device/Detector/IDetector.cpp
@@ -213,7 +213,6 @@ std::unique_ptr<Datafield> IDetector::createDetectorMap() const
tmp->clip(regionOfInterestBounds(iAxis));
axes.emplace_back(tmp);
}
-
return std::make_unique<Datafield>(axes);
}
diff --git a/GUI/Model/Data/DataItem.cpp b/GUI/Model/Data/DataItem.cpp
index afec26e371e028bad1f3c45622957a0f0a5b8b4a..28acd5533f92e0829b80c012896262b190c6bac5 100644
--- a/GUI/Model/Data/DataItem.cpp
+++ b/GUI/Model/Data/DataItem.cpp
@@ -40,7 +40,6 @@ void DataItem::setDatafield(Datafield* data)
m_datafield.reset(data);
setLastModified(QDateTime::currentDateTime());
- qInfo() << this << "set new datafield" << data << m_data.get();
emit datafieldChanged();
}
diff --git a/GUI/Model/Data/JobItemUtils.cpp b/GUI/Model/Data/JobItemUtils.cpp
index 0d9a0f3e709ecd19e341ce2519ed00d7d5f138f7..f7a324e0c5f76869ca22c32e944041c96d17efe5 100644
--- a/GUI/Model/Data/JobItemUtils.cpp
+++ b/GUI/Model/Data/JobItemUtils.cpp
@@ -46,16 +46,17 @@ void GUI::Model::JobItemUtils::updateDataAxes(DataItem* dataItem,
return;
}
- if (!dataItem->datafield())
+ Datafield* oldData = dataItem->datafield();
+ if (!oldData)
return;
Coords axes_units = GUI::Util::CoordName::coordFromName(dataItem->currentAxesUnits());
auto* const converter = instrumentItem->createCoordSystem();
- auto newData = std::make_unique<Datafield>(converter->convertedAxes(axes_units));
-
- newData->setVector(dataItem->datafield()->flatVector());
+ auto newData = std::make_unique<Datafield>(converter->convertedAxes(axes_units),
+ oldData->flatVector(),
+ oldData->errorSigmas());
dataItem->setDatafield(newData.release());
dataItem->setAxesRangeToData();
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index bebf48f7ef3e8277d1278d01e2e65321d7195df9..28fcdfd3605b8c4b841e4df3f010096c3845d382 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -377,11 +377,7 @@ RealItem* JobItem::createRealItem()
void JobItem::copyRealItemIntoJob(const RealItem* srcRealItem)
{
createRealItem();
- qInfo() << "\nJobItem::copyRealItemIntoJob";
- qInfo() << "source data" << srcRealItem->dataItem()->getDatafield() << srcRealItem->dataItem()->getDatafield()->hasErrorSigmas();
srcRealItem->copyTo(realItem());
- qInfo() << "target data" << realItem()->dataItem()->getDatafield() << realItem()->dataItem()->getDatafield()->hasErrorSigmas();
- qInfo() << "JobItem::copyRealItemIntoJob : copied\n";
if (isSpecularJob())
m_realItem->specularDataItem()->setRealPlotStyle();
diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp
index 613b06f6c8c83642158126b81b802921c43fb900..ff6472eef21ff11b76177e15b71485dcf7092fcd 100644
--- a/GUI/Model/Model/JobModel.cpp
+++ b/GUI/Model/Model/JobModel.cpp
@@ -67,8 +67,6 @@ JobItem* JobModel::addJob(const MultiLayerItem* sampleItem, const InstrumentItem
jobItem->createSumulatedDataItem();
if (realItem) {
- qInfo() << "addJob:rItem" << realItem << realItem->dataItem()->getDatafield() << realItem->dataItem()->getDatafield()->hasErrorSigmas();
- qInfo() << "addJob: spec" << realItem->specularDataItem() << realItem->specularDataItem()->getDatafield();
jobItem->copyRealItemIntoJob(realItem);
jobItem->adjustReaDataToJobInstrument();
diff --git a/GUI/View/Loaders/QREDataLoader.cpp b/GUI/View/Loaders/QREDataLoader.cpp
index 840858453d78463df21db98ddbc84c8bb90ed2ed..974eecb0164625c9e9c01949ad3f664574348ef9 100644
--- a/GUI/View/Loaders/QREDataLoader.cpp
+++ b/GUI/View/Loaders/QREDataLoader.cpp
@@ -552,7 +552,6 @@ void QREDataLoader::datafieldFromParsingResult(RealItem* item) const
eVec.push_back(m_importResult.eValues[lineNr]);
auto* oData = new Datafield({new PointwiseAxis("qVector", qVec)}, rVec, eVec); // eVec can be empty
- qInfo() << "REAL parsing" << item << oData;
// -- Replacement of item->setImportData(std::move(data));
item->initNativeData();
@@ -576,8 +575,6 @@ void QREDataLoader::datafieldFromParsingResult(RealItem* item) const
item->setNativeDataUnits(units_name);
item->setNativeDatafield(oData->clone()); // also takes ownership
- qInfo() << "SPEC parsing" << specularItem << specularItem->getDatafield();
- qInfo() << "NATI parsing" << item->nativeDatafield();
}
QDataStream& operator<<(QDataStream& stream, const QREDataLoader::ImportSettings& s)
diff --git a/GUI/View/PlotSpecular/SpecularPlot.cpp b/GUI/View/PlotSpecular/SpecularPlot.cpp
index 3a42b97611aef34748f51b9da3c188bdaead2b2f..ba3a792ff1b858e3d75c42b3a619da2a580a8653 100644
--- a/GUI/View/PlotSpecular/SpecularPlot.cpp
+++ b/GUI/View/PlotSpecular/SpecularPlot.cpp
@@ -142,7 +142,7 @@ void SpecularPlot::initPlot()
m_custom_plot->graph()->setScatterStyle(
QCPScatterStyle(item->scatter(), item->scatterSize()));
- // add error bars for ALL graphs. only for some items they will be filled and used
+ // create error bars for ALL graphs. only for some items they will be filled and used
QCPErrorBars* errorBars = new QCPErrorBars(m_custom_plot->xAxis, m_custom_plot->yAxis);
m_errorbar_map.insert(item, errorBars);
errorBars->removeFromLegend();
@@ -264,7 +264,7 @@ void SpecularPlot::setDataFromItem(SpecularDataItem* item)
ASSERT(m_errorbar_map.contains(item));
QCPErrorBars* errorBars = m_errorbar_map.value(item);
for (size_t i = 0; i < data->size(); ++i) {
- double y_Err = data->errorSigmaAt(i);
+ double y_Err = data->errorSigmas()[i];
errorBars->addData(y_Err);
}
}