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 1 Packages Releases Activity

removed salas code for the time being, implemented overwrite, fixed prob of communciating between detector and receiver for settimer

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@803 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2014-03-25 15:32:12 +00:00
parent b743ab2d04
commit 8b833b0f7e
20 changed files with 314 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -144,6 +144,7 @@ multiSlsDetector::multiSlsDetector(int id) : slsDetectorUtils(), shmId(-1)
/** set correction mask to 0*/
thisMultiDetector->correctionMask=1<<WRITE_FILE;
thisMultiDetector->correctionMask|=(1<<OVERWRITE_FILE);
/** set deat time*/
thisMultiDetector->tDead=0;
/** sets bad channel list file to none */
@ -4620,6 +4621,24 @@ int multiSlsDetector::enableWriteToFile(int enable){
int multiSlsDetector::overwriteFile(int enable){
int ret=-100, ret1;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) {
ret1=detectors[idet]->overwriteFile(enable);
if(detectors[idet]->getErrorMask())
setErrorMask(getErrorMask()|(1<<idet));
if (ret==-100)
ret=ret1;
else if (ret!=ret1)
ret=-1;
}
}
return ret;
}
int multiSlsDetector::setFrameIndex(int index){
int ret=-100, ret1;
@ -4676,6 +4695,22 @@ string multiSlsDetector::getErrorMessage(int &critical){
}
}
}
if(multiMask){
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_msdetect") !=NULL) || (strstr (output, "l_cartier") !=NULL)){
critical = 1;
retval.append("\n\n GET A CAKE!");
}
}
return retval;
}