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

somewhere

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-11-07 17:34:41 +01:00
parent e4dcd1cb6b
commit 39a2317d8d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.2.0
View File

Binary file not shown.

7
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1438,7 +1438,7 @@ int* multiSlsDetector::getDataFromDetector() {
#ifdef VERBOSE #ifdef VERBOSE
cout << "Detector " << id << " does not have data left " << endl; cout << "Detector " << id << " does not have data left " << endl;
#endif #endif
if(detectors[id]->getDetectorsType() != EIGER) if((detectors[id]->getDetectorsType() != EIGER)||(detectors[id]->getDetectorsType() != JUNGFRAU))
break; break;
} }
p+=n/sizeof(int); p+=n/sizeof(int);
@ -1447,6 +1447,7 @@ int* multiSlsDetector::getDataFromDetector() {
//eiger returns only null //eiger returns only null
detectorType types = getDetectorsType(); detectorType types = getDetectorsType();
//if(types == EIGER )
if(types == EIGER || types == JUNGFRAU) if(types == EIGER || types == JUNGFRAU)
return NULL; return NULL;
@ -1454,9 +1455,9 @@ int* multiSlsDetector::getDataFromDetector() {
for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) { for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
if (id!=nodatadet) { if (id!=nodatadet) {
if (detectors[id]) { if (detectors[id]) {
#ifdef VERBOSE //#ifdef VERBOSE
cout << "Stopping detector "<< id << endl; cout << "Stopping detector "<< id << endl;
#endif //#endif
detectors[id]->stopAcquisition(); detectors[id]->stopAcquisition();
if(detectors[id]->getErrorMask()) if(detectors[id]->getErrorMask())
setErrorMask(getErrorMask()|(1<<id)); setErrorMask(getErrorMask()|(1<<id));