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

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-08-08 16:18:04 +02:00
parent 23ea16f4b8
commit a77964e1dd
5 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorSoftware/src/Detector.cpp
View File

@ -209,7 +209,7 @@ Result<defs::coordinates> Detector::getDetectorOffsets(Positions pos) const {
}
void Detector::setDetectorOffsets(defs::coordinates value, Positions pos) {
return pimpl->Parallel(&slsDetector::setDetectorOffset, pos, value);
return pimpl->Parallel(&slsDetector::setDetectorOffsets, pos, value);
}
Result<bool> Detector::getQuad(Positions pos) const {
@ -228,7 +228,29 @@ void Detector::setReadNLines(const int value, Positions pos) {
pimpl->Parallel(&slsDetector::setReadNLines, pos, value);
}
Result<int> Detector::getControlPort(Positions pos) const {
return pimpl->Parallel(&slsDetector::getControlPort, pos);
}
void Detector::setControlPort(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setControlPort, pos, value);
}
Result<int> Detector::getStopPort(Positions pos) const {
return pimpl->Parallel(&slsDetector::getStopPort, pos);
}
void Detector::setStopPort(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setStopPort, pos, value);
}
Result<int> Detector::getReceiverPort(Positions pos) const {
return pimpl->Parallel(&slsDetector::getReceiverPort, pos);
}
void Detector::setReceiverPort(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setReceiverPort, pos, value);
}
// Erik
Result<int> Detector::getFramesCaughtByReceiver(Positions pos) const {

2
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -706,7 +706,7 @@ void slsDetector::setDetectorOffset(dimension d, int off) {
}
}
void slsDetector::setDetectorOffset(slsDetectorDefs::coordinates value) {
void slsDetector::setDetectorOffsets(slsDetectorDefs::coordinates value) {
shm()->offset[X] = value.x;
shm()->offset[Y] = value.y;
}