From b94a7d1dc12dff6e009effd4db23d9153067fb5e Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 23 May 2022 17:54:58 +0200
Subject: [PATCH] rm unused fct
---
GUI/Model/Device/Instrument.cpp | 5 -----
GUI/Model/Device/Instrument.h | 1 -
GUI/Model/Model/JobFunctions.cpp | 2 +-
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/GUI/Model/Device/Instrument.cpp b/GUI/Model/Device/Instrument.cpp
index a1e3d361e4a..b831b936fe5 100644
--- a/GUI/Model/Device/Instrument.cpp
+++ b/GUI/Model/Device/Instrument.cpp
@@ -35,11 +35,6 @@ const IDetector* Instrument::getDetector() const
return m_detector.get();
}
-IDetector* Instrument::getDetector()
-{
- return m_detector.get();
-}
-
const IDetector& Instrument::detector() const
{
return *m_detector;
diff --git a/GUI/Model/Device/Instrument.h b/GUI/Model/Device/Instrument.h
index 4121912bd34..275f9ce106d 100644
--- a/GUI/Model/Device/Instrument.h
+++ b/GUI/Model/Device/Instrument.h
@@ -31,7 +31,6 @@ public:
const Beam& beam() const { return *m_beam; }
- IDetector* getDetector();
const IDetector* getDetector() const;
IDetector& detector();
const IDetector& detector() const;
diff --git a/GUI/Model/Model/JobFunctions.cpp b/GUI/Model/Model/JobFunctions.cpp
index bad5de3f67c..b1d42c592c1 100644
--- a/GUI/Model/Model/JobFunctions.cpp
+++ b/GUI/Model/Model/JobFunctions.cpp
@@ -70,7 +70,7 @@ void cropRealData(JobItem* jobItem)
auto* instrument_item = jobItem->instrument2DItem();
GUI::Model::JobItemUtils::createDefaultDetectorMap(intensityItem, instrument_item);
- instrument_item->createInstrument()->getDetector()->iterateOverNonMaskedPoints(
+ instrument_item->createInstrument()->detector().iterateOverNonMaskedPoints(
[&](IDetector::const_iterator it) {
auto* cropped_data = intensityItem->getPowerfield();
(*cropped_data)[it.roiIndex()] = (*origData)[it.detectorIndex()];
--
GitLab