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

changes to receiver works for data compression. needs optimizing

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@699 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-11-28 14:31:03 +00:00
parent 0c3f1d95b9
commit 8e24fc7ef9
16 changed files with 892 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4362,30 +4362,31 @@ int multiSlsDetector::stopReceiver(){
slsDetectorDefs::runStatus multiSlsDetector::startReceiverReadout(){
int i=0;
runStatus s,s1;
i=thisMultiDetector->masterPosition;
if (thisMultiDetector->masterPosition>=0) {
if (detectors[i]) {
s1=detectors[i]->startReceiverReadout();
if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i));
runStatus s,s1;
}
}
for (i=0; i<thisMultiDetector->numberOfDetectors; i++) {
if (detectors[i]) {
s=detectors[i]->startReceiverReadout();
if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i));
if(s == ERROR)
s1 = ERROR;
if(s1 != s)
s1 = ERROR;
}
}
if (thisMultiDetector->masterPosition>=0)
if (detectors[thisMultiDetector->masterPosition]){
s = detectors[thisMultiDetector->masterPosition]->startReceiverReadout();
if(detectors[thisMultiDetector->masterPosition]->getErrorMask())
setErrorMask(getErrorMask()|(1<<thisMultiDetector->masterPosition));
return s;
}
if (detectors[0]) s=detectors[0]->startReceiverReadout();
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
s1=detectors[i]->startReceiverReadout();
if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i));
if (s1==ERROR)
s=ERROR;
if (s1==IDLE && s!=IDLE)
s=ERROR;
}
return s;
*stoppedFlag=1;
return s;
}
slsDetectorDefs::runStatus multiSlsDetector::getReceiverStatus(){