detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27:14 +02:00
Code Issues Actions Packages Releases Activity

compiling with and without root defined in makefile.include

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@819 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2014-04-09 10:28:53 +00:00
parent 49ea26abb2
commit a79046162f
4 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4669,7 +4669,6 @@ 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,23 +4695,6 @@ string multiSlsDetector::getErrorMessage(int &critical){
}
}
}
char output[255];
FILE* sysFile = popen("whoami", "r");
fgets(output, sizeof(output), sysFile);
pclose(sysFile);
sysFile = popen("whoami", "r");
fgets(output, sizeof(output), sysFile);
pclose(sysFile);
sysFile= NULL;
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;
}