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

Merge branch 'developer' into gappixels

Browse Source
This commit is contained in:
maliakal_d
2017-10-12 14:58:41 +02:00
parent 4260dc0baf d2767afa7c
commit 4f2af046d3
11 changed files with 101 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1163,7 +1163,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]) {
@ -1944,8 +1944,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)
@ -2010,7 +2011,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;
@ -2086,7 +2087,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;