detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-25 15:50:03 +02:00
Code Issues Actions Packages Releases Activity

compiles

Browse Source
This commit is contained in:
maliakal_d 2019-08-07 16:11:42 +02:00
parent e246a33269
commit eec7b22582
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/include/Detector.h
View File

@ -193,21 +193,21 @@ class Detector {
* Get Detector type as an enum
* @returns detector type
*/
detectorType Detector::getDetectorTypeAsEnum() const;
defs::detectorType getDetectorTypeAsEnum() const;
/**
* Get Detector type as an enum
* @param pos detector position
* @returns detector type
*/
Result<detectorType> getDetectorTypeAsEnum(Positions pos = {}) const;
Result<defs::detectorType> getDetectorTypeAsEnum(Positions pos = {}) const;
/**
* Returns detector type as a string
* @param pos detector position
* @returns detector type as string
*/
Result<std::string> getDetectorTypeAsString(Positions pos = {});
Result<std::string> getDetectorTypeAsString(Positions pos = {}) const;
};
} // namespace sls

19
slsDetectorSoftware/src/Detector.cpp
View File

@ -118,7 +118,7 @@ Result<bool> Detector::getFileOverWrite(Positions pos) const {
// dhanya
int Detector::getMultiId() const {
pimpl->getMultiId());
return pimpl->getMultiId();
}
void Detector::checkDetectorVersionCompatibility(Positions pos) const {
@ -130,18 +130,20 @@ void Detector::checkReceiverVersionCompatibility(Positions pos) const {
}
Result<int64_t> Detector::getDetectorFirmwareVersion(Positions pos) const {
return pimpl->Parallel(&slsDetector::getId, DETECTOR_FIRMWARE_VERSION, pos);
return pimpl->Parallel(&slsDetector::getId, pos, defs::DETECTOR_FIRMWARE_VERSION);
}
Result<int64_t> Detector::getDetectorServerVersion(Positions pos) const {
return pimpl->Parallel(&slsDetector::getId, DETECTOR_SOFTWARE_VERSION, pos);
return pimpl->Parallel(&slsDetector::getId, pos, defs::DETECTOR_SOFTWARE_VERSION);
}
Result<int64_t> Detector::getDetectorSerialNumber(Positions pos) const {
return pimpl->Parallel(&slsDetector::getId, DETECTOR_SERIAL_NUMBER, pos);
return pimpl->Parallel(&slsDetector::getId, pos, defs::DETECTOR_SERIAL_NUMBER);
}
Result<int64_t> Detector::getClientSoftwareVersion() const { return APILIB; }
Result<int64_t> Detector::getClientSoftwareVersion() const {
return pimpl->getClientSoftwareVersion();
}
Result<int64_t> Detector::getReceiverSoftwareVersion(Positions pos) const {
return pimpl->Parallel(&slsDetector::getReceiverSoftwareVersion, pos);
@ -151,16 +153,15 @@ std::string Detector::getUserDetails() const {
return pimpl->getUserDetails();
}
void Detector::setHostname(const std::vector<std::string> &name,
Positions pos) {
void Detector::setHostname(const std::vector<std::string> &name) {
pimpl->setHostname(name);
}
detectorType Detector::getDetectorTypeAsEnum() const {
defs::detectorType Detector::getDetectorTypeAsEnum() const {
return pimpl->getDetectorTypeAsEnum();
}
Result<detectorType> Detector::getDetectorTypeAsEnum(Positions pos) const {
Result<defs::detectorType> Detector::getDetectorTypeAsEnum(Positions pos) const {
return pimpl->Parallel(&slsDetector::getDetectorTypeAsEnum, pos);
}