This commit is contained in:
2019-08-09 12:11:42 +02:00
parent a3c5c16417
commit 1a60b59a48
12 changed files with 22 additions and 26 deletions

View File

@ -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

View File

@ -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)

View File

@ -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;
}

View File

@ -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