detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-20 02:48:54 +01:00
Code Issues Actions Packages Releases Activity

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-08-08 16:55:37 +02:00
parent eaf0d8668b
commit ca2c284017
5 changed files with 71 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
slsDetectorSoftware/src/Detector.cpp
View File

@@ -210,7 +210,8 @@ Result<defs::coordinates> Detector::getDetectorOffsets(Positions pos) const {
void Detector::setDetectorOffsets(defs::coordinates value, Positions pos) {
pimpl->Parallel(&slsDetector::setDetectorOffsets, pos, value);
//pimpl->Parallel<defs::coordinates>(&slsDetector::setDetectorOffset, pos, value);
// pimpl->Parallel<defs::coordinates>(&slsDetector::setDetectorOffset, pos,
// value);
}
Result<bool> Detector::getQuad(Positions pos) const {
@@ -253,6 +254,25 @@ void Detector::setReceiverPort(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setReceiverPort, pos, value);
}
Result<bool> Detector::getLockServer(Positions pos) {
return pimpl->Parallel(&slsDetector::lockServer, pos, -1);
}
void Detector::setLockServer(bool value, Positions pos) {
pimpl->Parallel(&slsDetector::lockServer, pos, static_cast<int>(value));
}
Result<std::string> Detector::getLastClientIP(Positions pos) {
return pimpl->Parallel(&slsDetector::getLastClientIP, pos);
}
void Detector::exitServer(Positions pos) {
pimpl->Parallel(&slsDetector::exitServer, pos);
}
void Detector::execCommand(const std::string &value, Positions pos) {
pimpl->Parallel(&slsDetector::execCommand, pos, value);
}
// Erik
Result<int> Detector::getFramesCaughtByReceiver(Positions pos) const {

4
slsDetectorSoftware/src/slsDetector.cpp
View File

@@ -761,12 +761,12 @@ int slsDetector::getControlPort() const { return shm()->controlPort; }
int slsDetector::getStopPort() const { return shm()->stopPort; }
int slsDetector::lockServer(int lock) {
bool slsDetector::lockServer(int lock) {
int retval = -1;
FILE_LOG(logDEBUG1) << "Setting detector server lock to " << lock;
sendToDetector(F_LOCK_SERVER, lock, retval);
FILE_LOG(logDEBUG1) << "Lock: " << retval;
return retval;
return (retval == 1 ? true : false);
}
std::string slsDetector::getLastClientIP() {