From 7046d2ad6eb942ffa9e6973b36d427b19af84773 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Thu, 28 May 2015 14:46:46 +0200
Subject: [PATCH] fixed merge

---
 slsDetectorCalibration/moenchReadData.C  |  7 ++++---
 slsDetectorCalibration/slsDetectorData.h | 18 +-----------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/slsDetectorCalibration/moenchReadData.C b/slsDetectorCalibration/moenchReadData.C
index 965b2e88c..632f743c3 100644
--- a/slsDetectorCalibration/moenchReadData.C
+++ b/slsDetectorCalibration/moenchReadData.C
@@ -16,7 +16,7 @@
 #include <fstream>
 #include "moench02ModuleData.h"
 #include "moenchCommonMode.h"
-#define MYROOT1
+
 #include "singlePhotonDetector.h"
 
 //#include "MovingStat.h"
@@ -27,7 +27,8 @@ using namespace std;
 #define NR 160
 
 
-//#define MY_DEBUG 1
+#define MY_DEBUG 1
+
 #ifdef MY_DEBUG
 #include <TCanvas.h>
 #endif
@@ -216,7 +217,7 @@ THStack *moenchReadData(char *fformat, char *tit, int runmin, int runmax, int nb
 #endif		    
       nf++;
       
-      cout << "=" << decoder->getFrameNumber(buff);
+      cout << "=" ;
       delete [] buff;
     }
     cout << nph << endl;
diff --git a/slsDetectorCalibration/slsDetectorData.h b/slsDetectorCalibration/slsDetectorData.h
index 932fd589e..3da6a0407 100644
--- a/slsDetectorCalibration/slsDetectorData.h
+++ b/slsDetectorCalibration/slsDetectorData.h
@@ -92,23 +92,7 @@ class slsDetectorData {
 
 
   void setDataMap(int **dMap=NULL) {
-<<<<<<< HEAD
 
-
-    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;
-	}
-    }
-    
-=======
     int ip;
 
 	  if (dMap==NULL) {
@@ -129,7 +113,7 @@ class slsDetectorData {
 		  }
 	  }
 	 // cout << "nx:" <<nx << " ny:" << ny << endl;
->>>>>>> 844c207d55aa5279626c496c677446de61103a30
+
   };