From e3db7099f17426cb1b8c5518953b0ee029906670 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Wed, 24 Jul 2019 09:07:26 +0200 Subject: [PATCH] removed non const getFileIndex in multi --- slsDetectorSoftware/include/multiSlsDetector.h | 7 ------- slsDetectorSoftware/src/multiSlsDetector.cpp | 11 ----------- 2 files changed, 18 deletions(-) diff --git a/slsDetectorSoftware/include/multiSlsDetector.h b/slsDetectorSoftware/include/multiSlsDetector.h index 6b4f4a5ac..5cda18063 100755 --- a/slsDetectorSoftware/include/multiSlsDetector.h +++ b/slsDetectorSoftware/include/multiSlsDetector.h @@ -1775,13 +1775,6 @@ class multiSlsDetector : public virtual slsDetectorDefs { */ fileFormat setFileFormat(fileFormat f, int detPos = -1); - /** - * Returns file index - * @param detPos -1 for all detectors in list or specific detector position - * @returns file index - */ - int getFileIndex(int detPos = -1); - /** * Sets up the file index * @param i file index diff --git a/slsDetectorSoftware/src/multiSlsDetector.cpp b/slsDetectorSoftware/src/multiSlsDetector.cpp index 5e4e9c8cf..4d4d33cd4 100755 --- a/slsDetectorSoftware/src/multiSlsDetector.cpp +++ b/slsDetectorSoftware/src/multiSlsDetector.cpp @@ -3064,17 +3064,6 @@ slsDetectorDefs::fileFormat multiSlsDetector::setFileFormat(fileFormat f, int de return sls::minusOneIfDifferent(r); } -int multiSlsDetector::getFileIndex(int detPos) { - // single - if (detPos >= 0) { - return detectors[detPos]->getFileIndex(); - } - - // multi - auto r = serialCall(&slsDetector::getFileIndex); - return sls::minusOneIfDifferent(r); -} - int multiSlsDetector::incrementFileIndex(int detPos) { // single if (detPos >= 0) {