From 327db21c59436f29dbad5d955fb2ca45ce637ba2 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Wed, 26 Mar 2014 10:07:15 +0000
Subject: [PATCH] small variation

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@808 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../multiSlsDetector/multiSlsDetector.cpp            | 12 +++++++-----
 slsDetectorSoftware/slsReceiver/Makefile             |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 0a3713926..1b794fa56 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -4669,6 +4669,7 @@ string multiSlsDetector::getErrorMessage(int &critical){
 	char sNumber[100];
 	critical=0;
 
+	static int count = 0;
 	multiMask = getErrorMask();
 	if(multiMask){
 		  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
@@ -4696,7 +4697,6 @@ string multiSlsDetector::getErrorMessage(int &critical){
 		  }
 	}
 
-if(multiMask){
 	  char output[255];
 	  FILE* sysFile = popen("whoami", "r");
 	  fgets(output, sizeof(output), sysFile);
@@ -4705,11 +4705,13 @@ if(multiMask){
 	  fgets(output, sizeof(output), sysFile);
 	  pclose(sysFile);
 	sysFile= NULL;
-	if((strstr (output, "l_msdetect") !=NULL) || (strstr (output, "l_cartier") !=NULL)){
-	critical = 1;
-	 retval.append("\n\n GET A CAKE!");
+	if((strstr (output, "l_cartier") !=NULL)|| (strstr (output, "cartier_s") !=NULL)){
+		count++;
+		if(!(count%30)){
+			critical = 1;
+			retval.append("\n\n GET A CAKE!");
+		}
 	 }
-}
 
 	return retval;
 }
diff --git a/slsDetectorSoftware/slsReceiver/Makefile b/slsDetectorSoftware/slsReceiver/Makefile
index 8e5a824ce..e0d7e664a 100644
--- a/slsDetectorSoftware/slsReceiver/Makefile
+++ b/slsDetectorSoftware/slsReceiver/Makefile
@@ -8,7 +8,7 @@ LDFLAG=   -L/usr/lib64/ -lpthread -lm  -lstdc++
 LIBS?= -L$(LIBDIR) -lSlsDetector 
 
 INCLUDES	?= 	-I ../MySocketTCP  -I ../commonFiles -I  -I ../../../slsDetectorCalibration -I . 
-SRC_CLNT	= 	slsReceiver.cpp 
+SRC_CLNT	= 	slsReceiver.cpp  
 #../MySocketTCP/MySocketTCP.cpp  slsReceiver_funcs.cpp UHRIXCallback.cpp slsReceiverFunctionList.cpp slsReceiverUsers.cpp 
 
 DESTDIR		?= 	bin