detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-25 07:40:03 +02:00
Code Issues Actions Packages Releases Activity

bug fix: using int instead of int64_t , eg exptime is -1 on return

Browse Source
This commit is contained in:
maliakal_d 2017-10-12 09:47:13 +02:00
parent 44bf4c52ed
commit f2f061ae18
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1129,7 +1129,7 @@ string multiSlsDetector::checkOnline() {
int multiSlsDetector::activate(int const enable){ int multiSlsDetector::activate(int const enable){
int i; int i;
int64_t ret1=-100, ret; int ret1=-100, ret;
for (i=0; i<thisMultiDetector->numberOfDetectors; ++i) { for (i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
if (detectors[i]) { if (detectors[i]) {
@ -1978,7 +1978,7 @@ void multiSlsDetector::resetFinalDataQueue() {
*/ */
int64_t multiSlsDetector::setTimer(timerIndex index, int64_t t){ int64_t multiSlsDetector::setTimer(timerIndex index, int64_t t){
int ret=-100; int64_t ret=-100;
if(!threadpool){ if(!threadpool){
cout << "Error in creating threadpool. Exiting" << endl; cout << "Error in creating threadpool. Exiting" << endl;
@ -2054,7 +2054,7 @@ int64_t multiSlsDetector::getTimeLeft(timerIndex index){
int multiSlsDetector::setSpeed(speedVariable index, int value){ int multiSlsDetector::setSpeed(speedVariable index, int value){
int i; int i;
int64_t ret1=-100, ret; int ret1=-100, ret;