mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-02-01 23:54:56 +01:00
ctb & moench: phase fix for absolute within limits, option to set as degrees and get max phase shift, bug fix for eiger with implementation of 2 udp interface
This commit is contained in:
@@ -1199,14 +1199,14 @@ int64_t multiSlsDetector::getTimeLeft(timerIndex index, int detPos) {
|
||||
return sls::minusOneIfDifferent(r);
|
||||
}
|
||||
|
||||
int multiSlsDetector::setSpeed(speedVariable index, int value, int detPos) {
|
||||
int multiSlsDetector::setSpeed(speedVariable index, int value, int mode, int detPos) {
|
||||
// single
|
||||
if (detPos >= 0) {
|
||||
return detectors[detPos]->setSpeed(index, value);
|
||||
return detectors[detPos]->setSpeed(index, value, mode);
|
||||
}
|
||||
|
||||
// multi
|
||||
auto r = parallelCall(&slsDetector::setSpeed, index, value);
|
||||
auto r = parallelCall(&slsDetector::setSpeed, index, value, mode);
|
||||
return sls::minusOneIfDifferent(r);
|
||||
}
|
||||
|
||||
|
||||
@@ -1840,12 +1840,12 @@ int64_t slsDetector::getTimeLeft(timerIndex index) {
|
||||
return retval;
|
||||
}
|
||||
|
||||
int slsDetector::setSpeed(speedVariable sp, int value) {
|
||||
int slsDetector::setSpeed(speedVariable sp, int value, int mode) {
|
||||
int fnum = F_SET_SPEED;
|
||||
int ret = FAIL;
|
||||
int args[2] = {(int)sp, value};
|
||||
int args[3] = {(int)sp, value, mode};
|
||||
int retval = -1;
|
||||
FILE_LOG(logDEBUG1) << "Setting speed index " << sp << " to " << value;
|
||||
FILE_LOG(logDEBUG1) << "Setting speed index " << sp << " to " << value << " mode: " << mode;
|
||||
|
||||
if (detector_shm()->onlineFlag == ONLINE_FLAG) {
|
||||
auto client = DetectorSocket(detector_shm()->hostname, detector_shm()->controlPort);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user