From 7924989fb1bac543c9704e2c74d89669fb69b5ba Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Wed, 25 Mar 2015 15:14:03 +0100
Subject: [PATCH] some more changes for eiger mapping

---
 slsDetectorCalibration/eigerHalfModuleData.h |  5 +-
 slsDetectorCalibration/slsDetectorData.h     | 50 +++++++++++++-------
 slsDetectorCalibration/slsReceiverData.h     |  3 +-
 3 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/slsDetectorCalibration/eigerHalfModuleData.h b/slsDetectorCalibration/eigerHalfModuleData.h
index 9257c173b..555edee54 100644
--- a/slsDetectorCalibration/eigerHalfModuleData.h
+++ b/slsDetectorCalibration/eigerHalfModuleData.h
@@ -19,8 +19,8 @@ public:
 	 */
 
 
-	eigerHalfModuleData(int np, int dr, int t, int bsize, int dsize, double c=0): slsReceiverData<uint32_t>(xpixels, ypixels, nPackets, bsize),
-	xtalk(c), nPackets(np), dynamicRange(dr), bufferSize(bsize), dataSize(dsize){
+	eigerHalfModuleData(int dr, int np, int bsize, int dsize, double c=0): slsReceiverData<uint32_t>(xpixels, ypixels, np, bsize),
+	xtalk(c), dynamicRange(dr), bufferSize(bsize), dataSize(dsize){
 
 
 		int **dMap;
@@ -146,7 +146,6 @@ private:
 	const static int ypixels = 256;
 	const int bufferSize;
 	const int dataSize;
-	const int nPackets;
 	const int dynamicRange;
 
 
diff --git a/slsDetectorCalibration/slsDetectorData.h b/slsDetectorCalibration/slsDetectorData.h
index 26efa53af..d76310d21 100644
--- a/slsDetectorCalibration/slsDetectorData.h
+++ b/slsDetectorCalibration/slsDetectorData.h
@@ -87,19 +87,21 @@ class slsDetectorData {
   void setDataMap(int **dMap=NULL) {
 
 
-    if (dMap==NULL) {
-      for (int iy=0; iy<ny; iy++)
-	 for (int ix=0; ix<nx; ix++)
-	   dataMap[iy][ix]=(iy*nx+ix)*sizeof(dataType);
-    } else {
-      cout << "set dmap "<< dataMap << " " << dMap << endl;
-      for (int iy=0; iy<ny; iy++)
-	for (int ix=0; ix<nx; ix++) {
-	   dataMap[iy][ix]=dMap[iy][ix];
-	   cout << ix << " " << iy << endl;
-	}
-    }
-    
+	  if (dMap==NULL) {
+		  for (int iy=0; iy<ny; iy++)
+			  for (int ix=0; ix<nx; ix++)
+				  dataMap[iy][ix]=(iy*nx+ix)*sizeof(dataType);
+	  } else {
+		  cout << "set dmap "<< dataMap << " " << dMap << endl;
+		  for (int iy=0; iy<ny; iy++){
+			 // cout << iy << endl;
+			  for (int ix=0; ix<nx; ix++) {
+				  dataMap[iy][ix]=dMap[iy][ix];
+				 // cout << ix << " " << iy << endl;
+			  }
+		  }
+	  }
+	  cout << "nx:" <<nx << " ny:" << ny << endl;
   };
 
 
@@ -210,17 +212,33 @@ class slsDetectorData {
   */
   virtual dataType getChannel(char *data, int ix, int iy, int dr) {
     dataType m=0, d=0;
+    uint8_t d1=0;
+    uint8_t d2=0;
+    uint16_t d3=0;
+    uint32_t d4=0;
+    uint64_t t;
     uint64_t* s;
+    s= &t;
     if (ix>=0 && ix<nx && iy>=0 && iy<ny && dataMap[iy][ix]>=0 && dataMap[iy][ix]<dataSize) {
       m=dataMask[iy][ix];
-
+/*
       int k = (((ix * iy + iy) * (dr / 8)) % 8);//which byte (1 to 8)
       int index = (8 - k) * 8;
-      s = be64toh(((uint64_t)(*(((uint64_t*)data)+(dataMap[iy][ix]-index)))));
+      t = be64toh(((uint64_t)(*(((uint64_t*)data)+(dataMap[iy][ix]-index)))));
 
       d=*((dataType*)(s+(k*8)));
+      */
+      d=*((dataType*)(data+dataMap[iy][ix]));
     }
-    return d^m;
+    if(dr == 4)
+    	return d^0xf0;
+    else if(dr == 8)
+    	return d^d2;
+    else if(dr == 16)
+       	return d^d3;
+    else
+       	return d^d4;
+    //return d^m;
   };
 
   /**
diff --git a/slsDetectorCalibration/slsReceiverData.h b/slsDetectorCalibration/slsReceiverData.h
index 51e371434..4781cb36e 100644
--- a/slsDetectorCalibration/slsReceiverData.h
+++ b/slsDetectorCalibration/slsReceiverData.h
@@ -90,7 +90,7 @@ public:
 			dd+=packetSize;
 			np++;
 			// cout << pnum << " " << fn << " " << np << " " << dd << " " << dsize << endl;
-			if (np==nPackets)
+			if (np==nPackets){
 				if (pnum==nPackets) {
 					// cout << "Frame found!" << endl;
 					break;
@@ -98,6 +98,7 @@ public:
 					cout << "Too many packets for this frame! "<< fnum << " " << pnum << endl;
 					retval=NULL;
 				}
+			}
 		}
 		if (np<nPackets) {
 			if (np>0)