From dd1233bc7c325050471c54a9a308aced045b74b1 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Mon, 26 Oct 2015 11:26:16 +0100
Subject: [PATCH] outdir for multi is for all

---
 .../multiSlsDetector/multiSlsDetector.cpp     | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index e7845b09f..a66e22998 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -4351,20 +4351,24 @@ string multiSlsDetector::checkReceiverOnline() {
 
 
 string multiSlsDetector::setFilePath(string s) {
-	if(!s.empty())
-		fileIO::setFilePath(s);
-	/*
-  string ret="error", ret1;
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
-    if (detectors[idet]) {
-      ret1=detectors[idet]->setFilePath(s);
-      if (ret=="error")
-	ret=ret1;
-      else if (ret!=ret1)
-	ret="";
-    }
-  }
-  return ret;*/
+
+	string ret="errorerror", ret1;
+	if(!s.empty()){
+
+		for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+			if (detectors[idet]) {
+				ret1=detectors[idet]->setFilePath(s);
+			      if(detectors[idet]->getErrorMask())
+				setErrorMask(getErrorMask()|(1<<idet));
+				if (ret=="errorerror")
+					ret=ret1;
+				else if (ret!=ret1)
+					ret="";
+			}
+		}
+		fileIO::setFilePath(ret);
+	}
+
 	return fileIO::getFilePath();
 }