From 35cd736c4cceb6f7e359f06e0984727549dfd6b9 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Mon, 10 Aug 2015 15:12:32 +0200
Subject: [PATCH 1/3] nothing much, made it more compatible

---
 slsDetectorCalibration/eigerHalfModuleData.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slsDetectorCalibration/eigerHalfModuleData.h b/slsDetectorCalibration/eigerHalfModuleData.h
index 62064a3aa..b4b7957cb 100644
--- a/slsDetectorCalibration/eigerHalfModuleData.h
+++ b/slsDetectorCalibration/eigerHalfModuleData.h
@@ -255,7 +255,7 @@ public:
 
 	 */
 
-	virtual uint32_t getChannel(char *data, int ix, int iy, int dr) {
+	virtual int getChannel(char *data, int ix, int iy, int dr) {
 		uint32_t m=0, n = 0;
 		uint64_t t;
 		int numBytes,divFactor,pixelval;

From 03c41a759f5a43a0e18e3d9c961c3041b7563325 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Fri, 4 Sep 2015 17:40:13 +0200
Subject: [PATCH 2/3] should work for 10g now

---
 slsDetectorCalibration/eigerHalfModuleData.h | 23 ++------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/slsDetectorCalibration/eigerHalfModuleData.h b/slsDetectorCalibration/eigerHalfModuleData.h
index b4b7957cb..65375acc6 100644
--- a/slsDetectorCalibration/eigerHalfModuleData.h
+++ b/slsDetectorCalibration/eigerHalfModuleData.h
@@ -36,7 +36,7 @@ public:
 		}
 
 		//Map
-		int totalNumberOfBytes = 1040 * dynamicRange * 16 *2; //for both 1g and 10g
+		int totalNumberOfBytes = numberOfPackets * bufferSize;
 		int iPacket1 = 8;
 		int iPacket2 = (totalNumberOfBytes/2) + 8;
 		int iData1 = 0, iData2 = 0;
@@ -49,6 +49,7 @@ public:
 		int iPort;
 
 
+
 		if(top){
 			for (int ir=0; ir<ypixels; ir++) {
 				for (int ic=0; ic<xpixels; ic = ic + ic_increment) {
@@ -257,34 +258,14 @@ public:
 
 	virtual int getChannel(char *data, int ix, int iy, int dr) {
 		uint32_t m=0, n = 0;
-		uint64_t t;
-		int numBytes,divFactor,pixelval;
 
 		//cout <<"ix:"<<ix<<" nx:"<<nx<<" iy:"<<iy<<" ny:"<<ny<<" datamap[iy][ix]:"<< dataMap[iy][ix] <<" datasize:"<< dataSize <<endl;
 		if (ix>=0 && ix<nx && iy>=0 && iy<ny && dataMap[iy][ix]>=0 && dataMap[iy][ix]<dataSize) {
 			m=dataMask[iy][ix];
 
-			numBytes = (nx * iy + ix);
-			divFactor=2;
-			if(dr == 4) divFactor = 16;
-			else if (dr == 8) divFactor = 8;
-			else if (dr == 16) divFactor = 4;
-
-			pixelval = numBytes % divFactor;
-			/*//big endian
-			 newix = ix - pixelval;
-			 */
-
 		}else
 			cprintf(RED,"outside limits\n");
 
-		/*//big endian
-		t = ((uint64_t)(*((uint64_t*)(((char*)data)+(dataMap[iy][newix])))));
-		if(dr == 4)			return ((t >> (pixelval*4)) & 0xf)^m;
-		else if(dr == 8)	return ((t >> (pixelval*8)) & 0xff)^m;
-		else if(dr == 16)	return ((t >> (pixelval*16)) & 0xffff)^m;
-		else				return ((t >> (pixelval*32)) & 0xffffffff)^m;
-		 */
 
 		//little endian
 		n = ((uint32_t)(*((uint32_t*)(((char*)data)+(dataMap[iy][ix])))));

From 22ba839ad503063b53ee66bfbacf41e509553081 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Tue, 22 Sep 2015 11:39:33 +0200
Subject: [PATCH 3/3] commenting out unnecessary lines

---
 slsDetectorCalibration/slsReceiverData.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slsDetectorCalibration/slsReceiverData.h b/slsDetectorCalibration/slsReceiverData.h
index fab0d8dfa..0a67ede4c 100644
--- a/slsDetectorCalibration/slsReceiverData.h
+++ b/slsDetectorCalibration/slsReceiverData.h
@@ -103,7 +103,7 @@ public:
 			if (np==nPackets){
 				if (pnum==nPackets) {
 					//cprintf(BG_GREEN, "Frame Found\n");
-					 cout << "Frame found!" << endl;
+					 //cout << "Frame found!" << endl;
 					break;
 				}     else {
 					//cprintf(BG_RED, "Too many packets for this frame! fnum:%d, pnum:%d np:%d\n",fnum,pnum,np);