detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-16 23:07:13 +02:00
Code Issues Actions Packages Releases Activity

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-08-07 12:32:59 +02:00
parent dd6a95d041
commit 615835f03d
3 changed files with 79 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
slsDetectorSoftware/src/Detector.cpp
View File

@ -11,7 +11,6 @@ Detector::Detector(int multi_id)
: pimpl(sls::make_unique<multiSlsDetector>(multi_id)) {}
Detector::~Detector() = default;
// Acquisition
void Detector::acquire() { pimpl->acquire(); }
@ -26,13 +25,9 @@ Result<defs::runStatus> Detector::getReceiverStatus(Positions pos) {
return pimpl->Parallel(&slsDetector::getReceiverStatus, pos);
}
bool Detector::getAcquiringFlag() const{
return pimpl->getAcquiringFlag();
}
bool Detector::getAcquiringFlag() const { return pimpl->getAcquiringFlag(); }
void Detector::setAcquiringFlag(bool value){
pimpl->setAcquiringFlag(value);
}
void Detector::setAcquiringFlag(bool value) { pimpl->setAcquiringFlag(value); }
// Configuration
Result<std::string> Detector::getHostname(Positions pos) const {
@ -41,7 +36,6 @@ Result<std::string> Detector::getHostname(Positions pos) const {
void Detector::freeSharedMemory() { pimpl->freeSharedMemory(); }
void Detector::setConfig(const std::string &fname) {
pimpl->readConfigurationFile(fname);
}
@ -126,12 +120,33 @@ Result<bool> Detector::getFileOverWrite(Positions pos) const {
return pimpl->Parallel(&slsDetector::getFileOverWrite, pos);
}
// dhanya
Result<bool> Detector::checkDetectorVersionCompatibility(Positions pos) const {
return pimpl->Parallel(&slsDetector::checkDetectorVersionCompatibility, pos);
Result<void> Detector::checkDetectorVersionCompatibility(Positions pos) const {
pimpl->Parallel(&slsDetector::checkDetectorVersionCompatibility, pos);
}
Result<void> Detector::checkReceiverVersionCompatibility(Positions pos) const {
pimpl->Parallel(&slsDetector::checkReceiverVersionCompatibility, pos);
}
Result<int64_t> Detector::getDetectorFirmwareVersion(Positions pos) const {
return pimpl->Parallel(&slsDetector::getId, DETECTOR_FIRMWARE_VERSION, pos);
}
Result<int64_t> Detector::getDetectorServerVersion(Positions pos) const {
return pimpl->Parallel(&slsDetector::getId, DETECTOR_SOFTWARE_VERSION, pos);
}
Result<int64_t> Detector::getDetectorSerialNumber(Positions pos) const {
return pimpl->Parallel(&slsDetector::getId, DETECTOR_SERIAL_NUMBER, pos);
}
Result<int64_t> Detector::getClientSoftwareVersion() const {
return APILIB;
}
Result<int64_t> Detector::getReceiverSoftwareVersion(Positions pos) const {
return pimpl->Parallel(&slsDetector::getReceiverSoftwareVersion, pos);
}
} // namespace sls