From f2f061ae18109a9fc8b5bc3996c5a151ae3ed4ce Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Thu, 12 Oct 2017 09:47:13 +0200
Subject: [PATCH] bug fix: using int instead of int64_t , eg exptime is -1 on
 return

---
 slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 786d24c8b..53d9d1be9 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -1129,7 +1129,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]) {
@@ -1978,7 +1978,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;
@@ -2054,7 +2054,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;