detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 22:40:02 +02:00
Code Issues Actions Packages Releases Activity

small variation

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@808 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2014-03-26 10:07:15 +00:00
parent a1bd5cdae6
commit 327db21c59
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -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;
}

2
slsDetectorSoftware/slsReceiver/Makefile
View File

@ -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