diff --git a/slsDetectorGui/src/qTabAdvanced.cpp b/slsDetectorGui/src/qTabAdvanced.cpp index 9efa24faf..0faad922a 100755 --- a/slsDetectorGui/src/qTabAdvanced.cpp +++ b/slsDetectorGui/src/qTabAdvanced.cpp @@ -124,7 +124,7 @@ void qTabAdvanced::PopulateDetectors() { SLOT(SetDetector(int))); comboDetector->clear(); - for (int i = 0; i < myDet->getNumberOfDetectors(); ++i) + for (int i = 0; i < myDet->size(); ++i) comboDetector->addItem(QString(myDet->getHostname(i).c_str())); comboDetector->setCurrentIndex(0); diff --git a/slsDetectorGui/src/qTabDataOutput.cpp b/slsDetectorGui/src/qTabDataOutput.cpp index 58942a86f..da7b9d55b 100755 --- a/slsDetectorGui/src/qTabDataOutput.cpp +++ b/slsDetectorGui/src/qTabDataOutput.cpp @@ -80,8 +80,8 @@ void qTabDataOutput::PopulateDetectors() { comboDetector->clear(); comboDetector->addItem("All"); - if (myDet->getNumberOfDetectors() > 1) { - for (int i = 0; i < myDet->getNumberOfDetectors(); ++i) + if (myDet->size() > 1) { + for (int i = 0; i < myDet->size(); ++i) comboDetector->addItem(QString(myDet->getHostname(i).c_str())); } } diff --git a/slsDetectorGui/src/qTabDebugging.cpp b/slsDetectorGui/src/qTabDebugging.cpp index 936efcba5..a62373c50 100755 --- a/slsDetectorGui/src/qTabDebugging.cpp +++ b/slsDetectorGui/src/qTabDebugging.cpp @@ -55,7 +55,7 @@ void qTabDebugging::PopulateDetectors() { FILE_LOG(logDEBUG) << "Populating detectors"; comboDetector->clear(); - for (int i = 0; i < myDet->getNumberOfDetectors(); ++i) { + for (int i = 0; i < myDet->size(); ++i) { comboDetector->addItem(QString(myDet->getHostname(i).c_str())); } } diff --git a/slsDetectorGui/src/qTabDeveloper.cpp b/slsDetectorGui/src/qTabDeveloper.cpp index e62f5ac4c..7326740ad 100755 --- a/slsDetectorGui/src/qTabDeveloper.cpp +++ b/slsDetectorGui/src/qTabDeveloper.cpp @@ -124,8 +124,8 @@ void qTabDeveloper::PopulateDetectors() { comboDetector->clear(); comboDetector->addItem("All"); - if (myDet->getNumberOfDetectors() > 1) { - for (int i = 0; i < myDet->getNumberOfDetectors(); ++i) + if (myDet->size() > 1) { + for (int i = 0; i < myDet->size(); ++i) comboDetector->addItem(QString(myDet->getHostname(i).c_str())); } comboDetector->setCurrentIndex(0); diff --git a/slsDetectorSoftware/include/Detector.h b/slsDetectorSoftware/include/Detector.h index c9f080aef..ae35ccbd6 100644 --- a/slsDetectorSoftware/include/Detector.h +++ b/slsDetectorSoftware/include/Detector.h @@ -205,7 +205,7 @@ class Detector { * Returns the total number of detectors in the multidetector structure * @returns total number of detectors in the multidetector structure */ - int getTotalNumberOfDetectors() const; + int size() const; /** * Returns the number of detectors in the multidetector structure diff --git a/slsDetectorSoftware/include/multiSlsDetector.h b/slsDetectorSoftware/include/multiSlsDetector.h index 0383b3ea5..8fa7c3a55 100755 --- a/slsDetectorSoftware/include/multiSlsDetector.h +++ b/slsDetectorSoftware/include/multiSlsDetector.h @@ -381,7 +381,7 @@ class multiSlsDetector : public virtual slsDetectorDefs { * Returns the number of detectors in the multidetector structure * @returns number of detectors */ - int getNumberOfDetectors() const;// + int size() const;// /** * Returns number of detectors in dimension d @@ -872,10 +872,6 @@ class multiSlsDetector : public virtual slsDetectorDefs { */ int getDataBytes(int detPos = -1); - /** - * Returns the number of detectors in the multi structure*/ - size_t size() const { return detectors.size(); } - /** * Set/get dacs value * @param val value (in V) diff --git a/slsDetectorSoftware/include/multiSlsDetectorClient.h b/slsDetectorSoftware/include/multiSlsDetectorClient.h index e370d4905..c627d1813 100755 --- a/slsDetectorSoftware/include/multiSlsDetectorClient.h +++ b/slsDetectorSoftware/include/multiSlsDetectorClient.h @@ -101,7 +101,7 @@ class multiSlsDetectorClient { return; } } - if (parser.detector_id() >= detPtr->getNumberOfDetectors()) { + if (parser.detector_id() >= detPtr->size()) { os << "position is out of bounds.\n"; return; } diff --git a/slsDetectorSoftware/include/slsDetectorUsers.h b/slsDetectorSoftware/include/slsDetectorUsers.h index 1b93f9445..734aabbc8 100755 --- a/slsDetectorSoftware/include/slsDetectorUsers.h +++ b/slsDetectorSoftware/include/slsDetectorUsers.h @@ -99,7 +99,7 @@ public: * Returns the number of detectors in the multidetector structure * @returns number of detectors */ - int getNumberOfDetectors() const; + int size() const; /** * Returns the maximum number of channels of all detectors diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp index 7002fe296..014f14fd0 100644 --- a/slsDetectorSoftware/src/Detector.cpp +++ b/slsDetectorSoftware/src/Detector.cpp @@ -142,8 +142,8 @@ Result Detector::getDetectorTypeAsString(Positions pos) const { return pimpl->Parallel(&slsDetector::getDetectorTypeAsString, pos); } -int Detector::getTotalNumberOfDetectors() const { - return pimpl->getNumberOfDetectors(); +int Detector::size() const { + return pimpl->size(); } defs::coordinates Detector::getNumberOfDetectors() const { @@ -675,8 +675,8 @@ Result Detector::getAutoCompDisable(Positions pos) const { } void Detector::setPowerChip(bool on, Positions pos) { - if (on && pimpl->getNumberOfDetectors() > 3) { - for (int i = 0; i != pimpl->getNumberOfDetectors(); ++i) { + if (on && pimpl->size() > 3) { + for (int i = 0; i != pimpl->size(); ++i) { pimpl->powerChip(static_cast(on), i); usleep(1000 * 1000); } diff --git a/slsDetectorSoftware/src/multiSlsDetector.cpp b/slsDetectorSoftware/src/multiSlsDetector.cpp index 4a451ba1d..843fb1f41 100755 --- a/slsDetectorSoftware/src/multiSlsDetector.cpp +++ b/slsDetectorSoftware/src/multiSlsDetector.cpp @@ -660,7 +660,7 @@ std::string multiSlsDetector::getDetectorTypeAsString(int detPos) { return sls::concatenateIfDifferent(r); } -int multiSlsDetector::getNumberOfDetectors() const { return detectors.size(); } +int multiSlsDetector::size() const { return detectors.size(); } int multiSlsDetector::getNumberOfDetectors(dimension d) const { return multi_shm()->numberOfDetector[d]; @@ -747,7 +747,7 @@ void multiSlsDetector::setDetectorOffset(dimension d, int off, int detPos) { int multiSlsDetector::getQuad(int detPos) { int retval = detectors[0]->getQuad(); - if (retval && getNumberOfDetectors() > 1) { + if (retval && size() > 1) { throw RuntimeError("Quad type is available only for 1 Eiger Quad Half " "module, but it Quad is enabled for 1st readout"); } @@ -755,7 +755,7 @@ int multiSlsDetector::getQuad(int detPos) { } void multiSlsDetector::setQuad(const bool enable, int detPos) { - if (enable && getNumberOfDetectors() > 1) { + if (enable && size() > 1) { throw RuntimeError("Cannot set Quad type as it is available only for 1 " "Eiger Quad Half module."); } @@ -2238,7 +2238,7 @@ void multiSlsDetector::setROI(int n, ROI roiLimits[], int detPos) { ymin = roiLimits[i].ymin; ymax = roiLimits[i].ymax; - if (getNumberOfDetectors() > 1) { + if (size() > 1) { // check roi max values idet = decodeNChannel(xmax, ymax, channelX, channelY); FILE_LOG(logDEBUG1) << "Decoded Channel max vals: " << std::endl @@ -2885,7 +2885,7 @@ int multiSlsDetector::powerChip(int ival, int detPos) { } // multi delayed call for safety - if (ival >= 0 && getNumberOfDetectors() > 3) { + if (ival >= 0 && size() > 3) { std::vector r; r.reserve(detectors.size()); for (auto &d : detectors) { diff --git a/slsDetectorSoftware/src/slsDetectorCommand.cpp b/slsDetectorSoftware/src/slsDetectorCommand.cpp index 112fe18ed..c2a00202f 100755 --- a/slsDetectorSoftware/src/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/src/slsDetectorCommand.cpp @@ -2175,7 +2175,7 @@ std::string slsDetectorCommand::cmdAcquire(int narg, const char * const args[], if (action == HELP_ACTION) { return helpAcquire(HELP_ACTION); } - if (!myDet->getNumberOfDetectors()) { + if (!myDet->size()) { FILE_LOG(logERROR) << "This shared memory has no detectors added. Aborting."; return std::string("acquire failed"); } diff --git a/slsDetectorSoftware/src/slsDetectorUsers.cpp b/slsDetectorSoftware/src/slsDetectorUsers.cpp index 36f115d37..f4b83b178 100755 --- a/slsDetectorSoftware/src/slsDetectorUsers.cpp +++ b/slsDetectorSoftware/src/slsDetectorUsers.cpp @@ -4,8 +4,8 @@ -int slsDetectorUsers::getNumberOfDetectors() const { - return detector.getNumberOfDetectors(); +int slsDetectorUsers::size() const { + return detector.size(); } int slsDetectorUsers::getMaximumDetectorSize(int &nx, int &ny){