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

deletion of retval in getdatafrom, client

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-11-07 17:57:03 +01:00
parent 39a2317d8d
commit 52cf790dde
2 changed files with 5 additions and 4 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.

9
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1438,8 +1438,8 @@ 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)||(detectors[id]->getDetectorsType() != JUNGFRAU)) /*if((detectors[id]->getDetectorsType() != EIGER)||(detectors[id]->getDetectorsType() != JUNGFRAU))
break; break;*/
} }
p+=n/sizeof(int); p+=n/sizeof(int);
} }
@ -1447,9 +1447,10 @@ 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) delete [] retval;
return NULL; return NULL;
}
if (nodatadet>=0) { if (nodatadet>=0) {
for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) { for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {