From 06f84585af79cc64c367b9b8300dd86b5ea97ed2 Mon Sep 17 00:00:00 2001
From: Erik Frojdh <erik.frojdh@gmail.com>
Date: Mon, 28 May 2018 11:55:11 +0200
Subject: [PATCH] compareRetrun.. to minusOneIf..

---
 .../multiSlsDetector/multiSlsDetector.cpp              | 10 ++++++----
 .../multiSlsDetector/multiSlsDetector.h                |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 1cebcbff1..cee469cbb 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -17,6 +17,8 @@ ID:         $Id$
 #include "slsDetector.h"
 #include "usersFunctions.h"
 
+
+
 #include <iostream>
 #include <rapidjson/document.h> //json header in zmq stream
 #include <string>
@@ -3305,7 +3307,7 @@ int multiSlsDetector::exitServer()
     return ival;
 }
 
-int multiSlsDetector::compareReturnValues(const std::vector<int>& return_values)
+int multiSlsDetector::minusOneIfDifferent(const std::vector<int>& return_values)
 {
 	int ret = -100;
     for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) {
@@ -3397,7 +3399,7 @@ int multiSlsDetector::parallelCallDetectorMember(int (slsDetector::*somefunc)(in
         }
         threadpool->startExecuting();
         threadpool->wait_for_tasks_to_complete();
-				return compareReturnValues(return_values);
+				return minusOneIfDifferent(return_values);
     }
 }
 
@@ -3417,7 +3419,7 @@ int multiSlsDetector::parallelCallDetectorMember(int (slsDetector::*somefunc)(in
         }
         threadpool->startExecuting();
         threadpool->wait_for_tasks_to_complete();
-				return compareReturnValues(return_values);
+				return minusOneIfDifferent(return_values);
     }
 }
 
@@ -3437,7 +3439,7 @@ int multiSlsDetector::parallelCallDetectorMember(int (slsDetector::*somefunc)())
         }
         threadpool->startExecuting();
         threadpool->wait_for_tasks_to_complete();
-				return compareReturnValues(return_values);
+				return minusOneIfDifferent(return_values);
     }
 }
 
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
index 7cff4fc47..75901676c 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
@@ -1050,7 +1050,7 @@ class multiSlsDetector  : public slsDetectorUtils {
   int parallelCallDetectorMember(int (slsDetector::*somefunc)());
   int parallelCallDetectorMember(int (slsDetector::*somefunc)(int), int value); //Should probably be templated
   int parallelCallDetectorMember(int (slsDetector::*somefunc)(int, int, int), int v0, int v1, int v2); //Should probably be templated
-  int compareReturnValues(const std::vector<int>&);
+  int minusOneIfDifferent(const std::vector<int>&);
 
   /** returns the detector trimbit/settings directory  \sa sharedSlsDetector */
   std::string getSettingsDir();