From 5e59c86d7249b599e5b208c85e3ebde1d7284f1a Mon Sep 17 00:00:00 2001
From: Anna Bergamaschi <anna.bergamaschi@psi.ch>
Date: Tue, 31 Mar 2015 14:41:06 +0200
Subject: [PATCH] Jungfrau10ModuleData modified

---
 slsDetectorCalibration/jungfrau10ModuleData.h | 61 ++++++++++---------
 slsDetectorCalibration/moench02CtbData.h      | 22 -------
 slsDetectorCalibration/slsDetectorData.h      | 28 ++++++---
 3 files changed, 50 insertions(+), 61 deletions(-)

diff --git a/slsDetectorCalibration/jungfrau10ModuleData.h b/slsDetectorCalibration/jungfrau10ModuleData.h
index a107f5058..39db07216 100644
--- a/slsDetectorCalibration/jungfrau10ModuleData.h
+++ b/slsDetectorCalibration/jungfrau10ModuleData.h
@@ -25,7 +25,7 @@ class jungfrau10ModuleData : public slsDetectorData<uint16_t> {
   */
   
 
-  jungfrau10ModuleData(int ns=16384): slsDetectorData<uint16_t>(256*4, 256*2, ns*2*32, NULL, NULL) , nadc(32), sc_width(64), sc_height(256) {
+ jungfrau10ModuleData(int ns=16384): slsDetectorData<uint16_t>(256*4, 256*2, 256*256*8*2, NULL, NULL, NULL) , iframe(0), nadc(32), sc_width(64), sc_height(256) {
 
     
    
@@ -35,48 +35,49 @@ class jungfrau10ModuleData : public slsDetectorData<uint16_t> {
     int iadc;
     int ix, iy;
 
-    
+    int ichip;
 
-    cout << nx << " " << ny << " " << dataSize << endl;
+    // cout << sizeof(uint16_t) << endl;
 
     for (iadc=0; iadc<nadc; iadc++) {
+      ichip=iadc/4;
+
       for (int i=0; i<sc_width*sc_height; i++) {
-	if (iadc<nadc/2) {
+
+	if (ichip%2==0) {
 	  row=sc_height+i/sc_width;
-	  col=iadc*sc_width+(i%sc_width);
-	} else {
-	  row=sc_height-1-i/sc_width;
-	  col=(ny-1)-(iadc-16)*sc_width-(i%sc_width);
+	  col=(ichip/2)*256+iadc%4*sc_width+(i%sc_width);
+	} else { 
+	  row=sc_height-1-i/sc_width; 
+	  col=((ichip/2)*256+iadc%4*sc_width)+sc_width-(i%sc_width)-1;
 	}
-	dataMap[row][col]=(nadc*i+iadc)*2;
-	if (dataMap[row][col]<0 || dataMap[row][col]>=dataSize)
-	   cout << "Error: pointer " << dataMap[row][col] << " out of range "<< endl;
 	  
+
+	
+/* 	if (iadc<nadc/2) { */
+/* 	  row=sc_height+i/sc_width; */
+/* 	  col=iadc*sc_width+(i%sc_width); */
+/* 	} else { */
+/* 	  row=sc_height-1-i/sc_width; */
+/* 	  col=(nx-1)-((iadc-16)*sc_width)-(i%sc_width); */
+/* 	} */
+	if (row<0 || row>=ny ||  col<0 || col>=nx) {
+	    cout << "Wrong row, column " << row << " " << col << " " << iadc << " " << i << endl;
+	} else
+	  dataMap[row][col]=(nadc*i+iadc)*2;
+	if (dataMap[row][col]<0 || dataMap[row][col]>=dataSize)
+	   cout << "Error: pointer " << dataMap[row][col] << " out of range " << row << " " << col  <<" " << iadc << " " << i << endl;
+	else {
+	  xmap[nadc*i+iadc]=col;
+	  ymap[nadc*i+iadc]=row;
+
+	}
       }
 
     }
-    for (int i=0; i<nx*ny; i++) {
-      isample=i/nadc;
-      iadc=i%nadc;
-      ix=isample%sc_width;
-      iy=isample/sc_width;
-      if (iadc<(nadc/2)) {
-	xmap[i]=iadc*sc_width+ix;//adc_nr[iadc]+ix;
-	ymap[i]=ny/2+iy;
-      } else {
-	xmap[i]=(ny-1)-(iadc-16)*sc_width-ix;//adc_nr[iadc]+ix;
-	ymap[i]=ny/2-1-iy;
-      }
-
-
-    }
-
-
 
     
     
-    iframe=0;
-    //  cout << "data struct created" << endl;
   };
   
   
diff --git a/slsDetectorCalibration/moench02CtbData.h b/slsDetectorCalibration/moench02CtbData.h
index 37bf8304d..b2860a3f3 100644
--- a/slsDetectorCalibration/moench02CtbData.h
+++ b/slsDetectorCalibration/moench02CtbData.h
@@ -36,9 +36,6 @@ class moench02CtbData : public slsDetectorData<uint16_t> {
     int iadc;
     int ix, iy;
 
-    xmap=new int[nx*ny];
-    ymap=new int[nx*ny];
-    
 
 
 
@@ -54,25 +51,6 @@ class moench02CtbData : public slsDetectorData<uint16_t> {
 	  
       }
     }
-    for (int i=0; i<nx*ny; i++) {
-      isample=i/32;
-      iadc=i%nadc;
-      ix=isample%sc_width;
-      iy=isample/sc_width;
-      if (iadc<(nadc/2)) {
-	xmap[i]=adc_nr[iadc]+ix;
-	ymap[i]=ny/2-1-iy;
-      } else {
-	xmap[i]=adc_nr[iadc]+ix;
-	ymap[i]=ny/2+iy;
-      }
-
-
-    }
-
-
-
-    
     
     iframe=0;
     //  cout << "data struct created" << endl;
diff --git a/slsDetectorCalibration/slsDetectorData.h b/slsDetectorCalibration/slsDetectorData.h
index b433960f3..0030091d7 100644
--- a/slsDetectorCalibration/slsDetectorData.h
+++ b/slsDetectorCalibration/slsDetectorData.h
@@ -41,6 +41,8 @@ class slsDetectorData {
   slsDetectorData(int npx, int npy, int dsize, int **dMap=NULL, dataType **dMask=NULL, int **dROI=NULL): nx(npx), ny(npy), dataSize(dsize) {
 
    
+    cout << "data size  is " <<  dataSize << endl;
+    cout << "detector size  is " <<  nx << " " << ny << endl;
 
     dataMask=new dataType*[ny];
     for(int i = 0; i < ny; i++) {
@@ -58,7 +60,7 @@ class slsDetectorData {
 	 dataROIMask[i][j]=1;
     }
     
-
+    cout << "map size is " <<  dataSize/sizeof(dataType) << endl;
     
     xmap=new int[dataSize/sizeof(dataType)];
     ymap=new int[dataSize/sizeof(dataType)];
@@ -75,16 +77,24 @@ class slsDetectorData {
   };
 
   virtual ~slsDetectorData() {
+    //  cout <<"delete xmap, ymap" << endl;
+    delete[] xmap;
+    delete[] ymap;
+
+    // cout <<"delete first d" << endl;
     for(int i = 0; i < ny; i++) {
-      delete [] dataMap[i];
-      delete [] dataMask[i];
-      delete [] dataROIMask[i];
+      // cout <<"delete data mask "<< i << endl;
+      delete[] dataMask[i];
+      // cout <<"delete data roi "<< i << endl;
+      delete[] dataROIMask[i];
+      // cout <<"delete data map "<< i << endl;
+      delete[] dataMap[i];
     }
-    delete [] dataMap;
-    delete [] dataMask;
-    delete [] dataROIMask;
-    delete [] xmap;
-    delete [] ymap;
+
+    // cout <<"delete second d" << endl;
+    delete[] dataMap;
+    delete[] dataMask;
+    delete[] dataROIMask;
   }