From 93c5af87ec592a3a0c132c5a4fba1f4bf43d2f9f Mon Sep 17 00:00:00 2001
From: Dimitar Tasev <dimtasev@gmail.com>
Date: Mon, 7 Jan 2019 10:53:01 +0000
Subject: [PATCH] Removed new column from PeaksWorkspace, re #24007
Adding the new column in the middle is a breaking change to already existing functionality - tests can be adapted, but user scripts might be affected
---
Framework/DataObjects/src/Peak.cpp | 2 --
Framework/DataObjects/src/PeakColumn.cpp | 1 -
Framework/DataObjects/src/PeaksWorkspace.cpp | 1 -
3 files changed, 4 deletions(-)
diff --git a/Framework/DataObjects/src/Peak.cpp b/Framework/DataObjects/src/Peak.cpp
index 1976024431d..8dc87b49aad 100644
--- a/Framework/DataObjects/src/Peak.cpp
+++ b/Framework/DataObjects/src/Peak.cpp
@@ -989,8 +989,6 @@ double Peak::getValueByColName(const std::string &name_in) const {
return this->getIntensity();
else if (name == "sigint")
return this->getSigmaIntensity();
- else if (name == "int/sigint")
- return this->getIntensityOverSigma();
else if (name == "bincount")
return this->getBinCount();
else if (name == "row")
diff --git a/Framework/DataObjects/src/PeakColumn.cpp b/Framework/DataObjects/src/PeakColumn.cpp
index 4ac47a336cf..1002f57d824 100644
--- a/Framework/DataObjects/src/PeakColumn.cpp
+++ b/Framework/DataObjects/src/PeakColumn.cpp
@@ -53,7 +53,6 @@ const std::string typeFromName(const std::string &name) {
TYPE_INDEX.emplace("DSpacing", "double");
TYPE_INDEX.emplace("Intens", "double");
TYPE_INDEX.emplace("SigInt", "double");
- TYPE_INDEX.emplace("Int/SigInt", "double");
TYPE_INDEX.emplace("BinCount", "double");
TYPE_INDEX.emplace("BankName", "str");
TYPE_INDEX.emplace("Row", "double");
diff --git a/Framework/DataObjects/src/PeaksWorkspace.cpp b/Framework/DataObjects/src/PeaksWorkspace.cpp
index 0ed56727e11..aa14fffcc51 100644
--- a/Framework/DataObjects/src/PeaksWorkspace.cpp
+++ b/Framework/DataObjects/src/PeaksWorkspace.cpp
@@ -659,7 +659,6 @@ void PeaksWorkspace::initColumns() {
addPeakColumn("DSpacing");
addPeakColumn("Intens");
addPeakColumn("SigInt");
- addPeakColumn("Int/SigInt");
addPeakColumn("BinCount");
addPeakColumn("BankName");
addPeakColumn("Row");
--
GitLab