From 39a2317d8d6c2c6172ee5e83881fb00ceda3a64e Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Mon, 7 Nov 2016 17:34:41 +0100
Subject: [PATCH] somewhere

---
 .../jungfrauDetectorServerv2.2.0              | Bin 126920 -> 126920 bytes
 .../multiSlsDetector/multiSlsDetector.cpp     |   7 ++++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.2.0 b/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.2.0
index 57db3054e6f492b29e3f48afdb57951c8643872c..91b3b7653ff5d1ffd6daf1f7b98b510b80a17251 100755
GIT binary patch
delta 23
fcmX?cpZ&yr_6b@{(_E$}PGgj4blK{{*zz6#d;<y0

delta 23
fcmX?cpZ&yr_6b@{eXi3Jr!h)2x@>h}Y<Uj=d!Px$

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