From d555bc6e75d778210608a1b3a4213f3ada228f1c Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Mon, 19 Dec 2016 11:33:16 +0100
Subject: [PATCH] fixwed the printing of errors but not error message

---
 slsDetectorSoftware/commonFiles/error_defs.h  | 41 +++++++++----------
 .../multiSlsDetector/multiSlsDetector.cpp     |  3 +-
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/slsDetectorSoftware/commonFiles/error_defs.h b/slsDetectorSoftware/commonFiles/error_defs.h
index 29bd97d35..1861d48da 100644
--- a/slsDetectorSoftware/commonFiles/error_defs.h
+++ b/slsDetectorSoftware/commonFiles/error_defs.h
@@ -8,16 +8,15 @@
 #ifndef ERROR_DEFS_H_
 #define ERROR_DEFS_H_
 
+#include "ansi.h"
+#include "sls_detector_defs.h"
 
+#include <stdio.h>
 #include <string>
 #include <cstring>
-using namespace std;
-
-
-#include "sls_detector_defs.h"
 #include <cstring>
 #include <iostream>
-
+using namespace std;
 
 /** Error flags */
 /*Assumption: Only upto 63 detectors */
@@ -26,22 +25,22 @@ using namespace std;
 #define MULTI_DETECTORS_NOT_ADDED			0x8000000000000000ULL
 
 
-#define CANNOT_CONNECT_TO_DETECTOR  		0x8000000000000000ULL
-#define CANNOT_CONNECT_TO_RECEIVER  		0x4000000000000000ULL
-#define COULDNOT_SET_CONTROL_PORT			0x2000000000000000ULL
-#define COULDNOT_SET_STOP_PORT				0x1000000000000000ULL
-#define COULDNOT_SET_DATA_PORT				0x0800000000000000ULL
-#define FILE_PATH_DOES_NOT_EXIST			0x0400000000000000ULL
-#define COULDNOT_CREATE_UDP_SOCKET			0x0200000000000000ULL
-#define COULDNOT_CREATE_FILE				0x0100000000000000ULL
-#define COULDNOT_ENABLE_COMPRESSION			0x0080000000000000ULL
-#define RECEIVER_DET_HOSTNAME_NOT_SET		0x0040000000000000ULL
-#define RECEIVER_DET_HOSTTYPE_NOT_SET		0x0020000000000000ULL
-#define DETECTOR_TEN_GIGA					0x0010000000000000ULL
-#define DETECTOR_ACTIVATE					0x0008000000000000ULL
-#define COULD_NOT_CONFIGURE_MAC				0x0004000000000000ULL
-#define COULDNOT_START_RECEIVER				0x0002000000000000ULL // default error like starting threads
-#define COULDNOT_STOP_RECEIVER				0x0001000000000000ULL
+#define CANNOT_CONNECT_TO_DETECTOR  		0x4000000000000000ULL
+#define CANNOT_CONNECT_TO_RECEIVER  		0x2000000000000000ULL
+#define COULDNOT_SET_CONTROL_PORT			0x1000000000000000ULL
+#define COULDNOT_SET_STOP_PORT				0x0800000000000000ULL
+#define COULDNOT_SET_DATA_PORT				0x0400000000000000ULL
+#define FILE_PATH_DOES_NOT_EXIST			0x0200000000000000ULL
+#define COULDNOT_CREATE_UDP_SOCKET			0x0100000000000000ULL
+#define COULDNOT_CREATE_FILE				0x0080000000000000ULL
+#define COULDNOT_ENABLE_COMPRESSION			0x0040000000000000ULL
+#define RECEIVER_DET_HOSTNAME_NOT_SET		0x0020000000000000ULL
+#define RECEIVER_DET_HOSTTYPE_NOT_SET		0x0010000000000000ULL
+#define DETECTOR_TEN_GIGA					0x0008000000000000ULL
+#define DETECTOR_ACTIVATE					0x0004000000000000ULL
+#define COULD_NOT_CONFIGURE_MAC				0x0002000000000000ULL
+#define COULDNOT_START_RECEIVER				0x0001000000000000ULL // default error like starting threads
+#define COULDNOT_STOP_RECEIVER				0x0000800000000000ULL
 
 //											0xFFFFFFFF00000000ULL
 
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index e4622fab7..db64114f2 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -140,8 +140,6 @@ multiSlsDetector::multiSlsDetector(int id) :  slsDetectorUtils(), shmId(-1)
     thisMultiDetector->fileIndex=0;
     /** set frames per file to default to 1*/
     thisMultiDetector->framesPerFile=1;
-    /** set fileIndex to default to 0*/
-    thisMultiDetector->fileIndex=0;
     /** set fileFormat to default to ascii*/
     thisMultiDetector->fileFormatType=ASCII;
 
@@ -4364,6 +4362,7 @@ int multiSlsDetector::readConfigurationFile(string const fname){
   // char ext[100];
 
   setAcquiringFlag(false);
+  clearAllErrorMask();
 
   string ans;
   string str;