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

included network tab in gui, correctedmulti to be able to clear sls detectors error mask,included coud not set up network parameter error

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@454 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-02-07 17:34:09 +00:00
parent 9fe499e20c
commit 35de710225
4 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -2542,7 +2542,9 @@ char* multiSlsDetector::setNetworkParameter(networkParameter p, string s){
while (p2!=string::npos) {
if (detectors[id]) {
detectors[id]->setCalDir(s.substr(p1,p2-p1));
detectors[id]->setNetworkParameter(p,s.substr(p1,p2-p1));
if(detectors[id]->getErrorMask())
setErrorMask(getErrorMask()|(1<<id));
}
id++;
s=s.substr(p2+1);
@ -3909,3 +3911,13 @@ string multiSlsDetector::getErrorMessage(int &critical){
}
return retval;
}
int64_t multiSlsDetector::clearAllErrorMask(){
clearErrorMask();
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++)
if (detectors[idet])
detectors[idet]->clearErrorMask();
return getErrorMask();
}

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1141,6 +1141,10 @@ class multiSlsDetector : public slsDetectorUtils {
*/
string getErrorMessage(int &critical);
/** Clears error mask of both multi and sls
/returns error mask
*/
int64_t clearAllErrorMask();
protected: