From d8af2e594a392d4ed1c674a11b6cc1426377217b Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Wed, 14 Aug 2019 10:42:54 +0200
Subject: [PATCH] eiger bug fix: quad mode, without gap pixels, data messed up

---
 cmk.sh                           |  5 +++++
 slsDetectorGui/src/qDrawPlot.cpp | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/cmk.sh b/cmk.sh
index d73649f99..950cd9a11 100755
--- a/cmk.sh
+++ b/cmk.sh
@@ -60,6 +60,7 @@ while getopts ":bchd:j:trge" opt ; do
 	b) 
 		echo "Building of CMake files Required"
 		REBUILD=1
+		CLEAN=1
 		;;
 	c) 
 		echo "Clean Required"
@@ -69,6 +70,7 @@ while getopts ":bchd:j:trge" opt ; do
 		echo "Building of CMake files with HDF5 option Required"
 		HDF5=1
 		REBUILD=1
+		CLEAN=1
 		;;
 	d) 
 		echo "New HDF5 directory: $OPTARG" 
@@ -82,16 +84,19 @@ while getopts ":bchd:j:trge" opt ; do
     	echo "Compiling Options: Text Client" 
 		TEXTCLIENT=1
 		REBUILD=1
+		CLEAN=1
 		;;      
 	r) 
 		echo "Compiling Options: Receiver" 
 		RECEIVER=1
 		REBUILD=1
+		CLEAN=1
 		;;      
 	g) 
 		echo "Compiling Options: GUI" 
 		GUI=1
 		REBUILD=1
+		CLEAN=1
 		;;  
 	e)
 		echo "Compiling Options: Debug" 
diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp
index a7344ae8f..6358522d1 100644
--- a/slsDetectorGui/src/qDrawPlot.cpp
+++ b/slsDetectorGui/src/qDrawPlot.cpp
@@ -129,8 +129,11 @@ void qDrawPlot::SetupWidgetWindow(){
 			break;
 		case slsDetectorDefs::EIGER:
 			if (myDet->setQuad()) {
-				nPixelsX = (myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::X) / 2) - 1;
+				nPixelsX = (myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::X) / 2);
 				nPixelsY = myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::Y) * 2;
+				if (nPixelsX != nPixelsY) {
+					--nPixelsX;
+				}
 			}
 			break;
 		default:
@@ -603,8 +606,11 @@ void qDrawPlot::SetScanArgument(int scanArg){
 			break;
 		case slsDetectorDefs::EIGER:
 			if (myDet->setQuad()) {
-				nPixelsX = (myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::X) / 2) - 1;
+				nPixelsX = (myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::X) / 2);
 				nPixelsY = myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::Y) * 2;
+				if (nPixelsX != nPixelsY) {
+					--nPixelsX;
+				}
 			}
 			break;
 		default: