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

merge fix from 3.0.1 which includes server without crash, multi settimer -1 bug, need to recompile eiger server for this branch

Browse Source
This commit is contained in:
maliakal_d
2017-10-12 14:42:57 +02:00
parent 0f302e3446 fe6e1c8868
commit 311059d748
11 changed files with 103 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1120,7 +1120,7 @@ string multiSlsDetector::checkOnline() {
int multiSlsDetector::activate(int const enable){
int i;
int64_t ret1=-100, ret;
int ret1=-100, ret;
for (i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
if (detectors[i]) {
@ -1901,8 +1901,9 @@ slsDetectorDefs::runStatus multiSlsDetector::getRunStatus() {
s1=detectors[i]->getRunStatus();
if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i));
if (s1==ERROR)
s=ERROR;
if (s1==ERROR) {
return ERROR;
}
if (s1!=IDLE)
s = s1;
// if (s1==IDLE && s!=IDLE)
@ -1967,7 +1968,7 @@ void multiSlsDetector::resetFinalDataQueue() {
*/
int64_t multiSlsDetector::setTimer(timerIndex index, int64_t t){
int ret=-100;
int64_t ret=-100;
if(!threadpool){
cout << "Error in creating threadpool. Exiting" << endl;
@ -2043,7 +2044,7 @@ int64_t multiSlsDetector::getTimeLeft(timerIndex index){
int multiSlsDetector::setSpeed(speedVariable index, int value){
int i;
int64_t ret1=-100, ret;
int ret1=-100, ret;