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

setting and getting printouts, changed the rx mess to 1000

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-11-07 15:34:47 +01:00
parent 8caa9d8779
commit e4dcd1cb6b
7 changed files with 66 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1350,7 +1350,6 @@ int multiSlsDetector::startAcquisition(){
int multiSlsDetector::stopAcquisition(){
int i=0;
int ret=OK, ret1=OK;
@ -1447,7 +1446,8 @@ int* multiSlsDetector::getDataFromDetector() {
}
//eiger returns only null
if(getDetectorsType() == EIGER)
detectorType types = getDetectorsType();
if(types == EIGER || types == JUNGFRAU)
return NULL;
if (nodatadet>=0) {