diff --git a/Device/Detector/IDetector.cpp b/Device/Detector/IDetector.cpp index 858683fc4054dd57a8ca2ff69969d6dc4215e1b0..769b4b326c8c951d02f4b6ba3f7c9f6fff0d58b0 100644 --- a/Device/Detector/IDetector.cpp +++ b/Device/Detector/IDetector.cpp @@ -204,7 +204,7 @@ void IDetector::iterateOverNonMaskedPoints(std::function<void(const_iterator)> f func(it); } -size_t IDetector::regionOfInterestIndexToDetectorIndex(const size_t i) const +size_t IDetector::roiToFullIndex(const size_t i) const { if (m_explicitROI.size() != 2) return i; diff --git a/Device/Detector/IDetector.h b/Device/Detector/IDetector.h index 24ac59492f6f18e7cc9140c8784b1ea56bc2e0dd..918914962b9fa43dd89f0eec28d2739048d1850a 100644 --- a/Device/Detector/IDetector.h +++ b/Device/Detector/IDetector.h @@ -129,7 +129,7 @@ public: //! Convert an index of the region of interest to an index of the detector. //! If no region of interest is set, then the index stays unmodified (since ROI == detector //! area). - size_t regionOfInterestIndexToDetectorIndex(size_t i) const; + size_t roiToFullIndex(size_t i) const; //! The lower and upper bound of the region of interest. If no region of interest is explicitly //! defined, then the whole detector is taken as "region of interest". diff --git a/Device/Detector/SimulationAreaIterator.cpp b/Device/Detector/SimulationAreaIterator.cpp index 45554bc1bc50d6b974a26ecdfefd6d04fc105d88..ca0b79529b1e309b8d15d03793ec0623f8999086 100644 --- a/Device/Detector/SimulationAreaIterator.cpp +++ b/Device/Detector/SimulationAreaIterator.cpp @@ -44,7 +44,7 @@ size_t SimulationAreaIterator::roiIndex() const size_t SimulationAreaIterator::detectorIndex() const { - return m_detector->regionOfInterestIndexToDetectorIndex(m_index); + return m_detector->roiToFullIndex(m_index); } SimulationAreaIterator& SimulationAreaIterator::operator++() @@ -73,7 +73,7 @@ size_t SimulationAreaIterator::nextIndex(size_t currentIndex) bool SimulationAreaIterator::isMasked(size_t index) const { const auto* masks = m_detector->detectorMask(); - const auto detectorIndex = m_detector->regionOfInterestIndexToDetectorIndex(index); + const auto detectorIndex = m_detector->roiToFullIndex(index); return masks && masks->isMasked(detectorIndex, m_detector->frame()); } diff --git a/Tests/Unit/Device/RegionOfInterestTest.cpp b/Tests/Unit/Device/RegionOfInterestTest.cpp index 7ff29940ca0138f22b2d27c90b6c621169f2fba4..e614a649aad664b096743e90559e9991205a6a9e 100644 --- a/Tests/Unit/Device/RegionOfInterestTest.cpp +++ b/Tests/Unit/Device/RegionOfInterestTest.cpp @@ -24,10 +24,10 @@ TEST(RegionOfInterestTest, constructor) EXPECT_EQ(detector.sizeOfRegionOfInterest(), 10u); // converting local roi index to global detector index - EXPECT_EQ(detector.regionOfInterestIndexToDetectorIndex(0), 9); - EXPECT_EQ(detector.regionOfInterestIndexToDetectorIndex(4), 13); - EXPECT_EQ(detector.regionOfInterestIndexToDetectorIndex(5), 17); - EXPECT_EQ(detector.regionOfInterestIndexToDetectorIndex(9), 21); + EXPECT_EQ(detector.roiToFullIndex(0), 9); + EXPECT_EQ(detector.roiToFullIndex(4), 13); + EXPECT_EQ(detector.roiToFullIndex(5), 17); + EXPECT_EQ(detector.roiToFullIndex(9), 21); } //! Testing region of interest which is larger than the detector. @@ -46,10 +46,10 @@ TEST(RegionOfInterestTest, largeArea) EXPECT_EQ(detector.sizeOfRegionOfInterest(), 32u); // converting local roi index to global detector index - EXPECT_EQ(detector.regionOfInterestIndexToDetectorIndex(5), 5u); - EXPECT_EQ(detector.regionOfInterestIndexToDetectorIndex(6), 6u); - EXPECT_EQ(detector.regionOfInterestIndexToDetectorIndex(9), 9u); - EXPECT_EQ(detector.regionOfInterestIndexToDetectorIndex(27), 27u); + EXPECT_EQ(detector.roiToFullIndex(5), 5u); + EXPECT_EQ(detector.roiToFullIndex(6), 6u); + EXPECT_EQ(detector.roiToFullIndex(9), 9u); + EXPECT_EQ(detector.roiToFullIndex(27), 27u); } //! Testing clone