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

edited getdatafromdetector to not stop detector for eiger

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-11-17 12:00:42 +01:00
parent 66db11421f
commit bc55f9d1e4
4 changed files with 105 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1293,66 +1293,72 @@ int multiSlsDetector::startReadOut(){
int* multiSlsDetector::getDataFromDetector() {
int nel=thisMultiDetector->dataBytes/sizeof(int);
int n;
int* retval=new int[nel];
int *retdet, *p=retval;
int nodata=1, nodatadet=-1;;
int nel=thisMultiDetector->dataBytes/sizeof(int);
int n;
int* retval=new int[nel];
int *retdet, *p=retval;
int nodata=1, nodatadet=-1;;
for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
if (detectors[id]) {
retdet=detectors[id]->getDataFromDetector(p);
n=detectors[id]->getDataBytes();
if(detectors[id]->getErrorMask())
setErrorMask(getErrorMask()|(1<<id));
if (retdet) {
nodata=0;
for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
if (detectors[id]) {
retdet=detectors[id]->getDataFromDetector(p);
n=detectors[id]->getDataBytes();
if(detectors[id]->getErrorMask())
setErrorMask(getErrorMask()|(1<<id));
if (retdet) {
nodata=0;
#ifdef VERBOSE
cout << "Detector " << id << " returned " << n << " bytes " << endl;
cout << "Detector " << id << " returned " << n << " bytes " << endl;
#endif
} else {
nodatadet=id;
} else {
nodatadet=id;
#ifdef VERBOSE
cout << "Detector " << id << " does not have data left " << endl;
cout << "Detector " << id << " does not have data left " << endl;
#endif
break;
}
p+=n/sizeof(int);
}
}
if (nodatadet>=0) {
for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
if (id!=nodatadet) {
if (detectors[id]) {
#ifdef VERBOSE
cout << "Stopping detector "<< id << endl;
#endif
detectors[id]->stopAcquisition();
if(detectors[id]->getErrorMask())
setErrorMask(getErrorMask()|(1<<id));
while ((retdet=detectors[id]->getDataFromDetector())) {
if(detectors[id]->getErrorMask())
setErrorMask(getErrorMask()|(1<<id));
#ifdef VERBOSE
cout << "Detector "<< id << " still sent data " << endl;
#endif
delete [] retdet;
}
if(detectors[id]->getErrorMask())
setErrorMask(getErrorMask()|(1<<id));
if(detectors[id]->getDetectorsType() != EIGER)
break;
}
p+=n/sizeof(int);
}
}
}
}
delete [] retval;
return NULL;
}
return retval;
//eiger returns only null
if(getDetectorsType() == EIGER)
return NULL;
if (nodatadet>=0) {
for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
if (id!=nodatadet) {
if (detectors[id]) {
#ifdef VERBOSE
cout << "Stopping detector "<< id << endl;
#endif
detectors[id]->stopAcquisition();
if(detectors[id]->getErrorMask())
setErrorMask(getErrorMask()|(1<<id));
while ((retdet=detectors[id]->getDataFromDetector())) {
if(detectors[id]->getErrorMask())
setErrorMask(getErrorMask()|(1<<id));
#ifdef VERBOSE
cout << "Detector "<< id << " still sent data " << endl;
#endif
delete [] retdet;
}
if(detectors[id]->getErrorMask())
setErrorMask(getErrorMask()|(1<<id));
}
}
}
delete [] retval;
return NULL;
}
return retval;
};