From 9517d4f0f2817f75d56b950f9b3c690a3cd31d23 Mon Sep 17 00:00:00 2001
From: bergamaschi <bergamaschi@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Tue, 17 Dec 2013 10:28:36 +0000
Subject: [PATCH] some bugs in the analysis solved

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@710 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../postProcessingFuncs.cpp                   | 27 ++++++++++++++-----
 .../singlePhotonFilter.cpp                    |  2 +-
 .../slsDetectorAnalysis/single_photon_hit.h   |  4 +--
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessingFuncs.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessingFuncs.cpp
index 2fe1c0a98..0cee5585f 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessingFuncs.cpp
+++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessingFuncs.cpp
@@ -12,7 +12,7 @@ postProcessingFuncs::postProcessingFuncs(int *nModules,int *chPerMod,int modMask
 
 int postProcessingFuncs::initDataset() {
 
-  // cout << "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA init dataset " << endl;
+  cout << "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA init dataset " << endl;
 
   if (nBins) {
     mp=new double[nBins];
@@ -34,7 +34,7 @@ int postProcessingFuncs::initDataset() {
 
 int postProcessingFuncs::finalizeDataset(double *ang, double *val, double *err, int *np) {
   
-  // cout << "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA finalize dataset " << endl;
+  cout << "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA finalize dataset " << endl;
 
   if (nBins) 
     *np=finalizeMerging(mp,mv,me,mm,nBins);
@@ -62,15 +62,27 @@ int postProcessingFuncs::finalizeDataset(double *ang, double *val, double *err,
   }
 
 
-
-  if (mp)
+  // cout << "delete mp " <<endl;
+  if (mp) {
     delete [] mp;
-  if (mv)
+    mp=NULL;
+  }
+  // cout << "delete mv " <<endl;
+  if (mv) {
     delete [] mv;
-  if (me)
+    mv=NULL;
+  }
+  // cout << "delete me " <<endl;
+  if (me) {
     delete [] me;
-  if (mm)
+    me=NULL;
+  }
+  // cout << "delete mm " <<endl;
+  if (mm) {
     delete [] mm;
+    mm=NULL;
+
+  }
 
 
   return 0;
@@ -536,6 +548,7 @@ int postProcessingFuncs::calculateFlatField(int* nModules, int *chPerMod, int *m
       cout << "done " << endl;
 
   delete [] xmed;
+  xmed=NULL;
 
   return 0;
 
diff --git a/slsDetectorSoftware/slsDetectorAnalysis/singlePhotonFilter.cpp b/slsDetectorSoftware/slsDetectorAnalysis/singlePhotonFilter.cpp
index aa5125465..9f55756d8 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/singlePhotonFilter.cpp
+++ b/slsDetectorSoftware/slsDetectorAnalysis/singlePhotonFilter.cpp
@@ -421,7 +421,7 @@ void singlePhotonFilter::findHits(){
 	int clusterIndex;
 	//	single_photon_hit *hit;
 
-	double clusterData[nClusterX*nClusterY];//	= hit.data;
+	double *clusterData;//[nClusterX*nClusterY];//	= hit.data;
 	double sigmarms;
 	double clusterrms;
 	double clusterped;
diff --git a/slsDetectorSoftware/slsDetectorAnalysis/single_photon_hit.h b/slsDetectorSoftware/slsDetectorAnalysis/single_photon_hit.h
index 5fd89548f..278c9f691 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/single_photon_hit.h
+++ b/slsDetectorSoftware/slsDetectorAnalysis/single_photon_hit.h
@@ -25,8 +25,8 @@ class single_photon_hit {
   ~single_photon_hit(){delete [] data;};
   void write(FILE *myFile) {fwrite((void*)this, 1, 3*sizeof(int)+2*sizeof(double), myFile); fwrite((void*)data, 1, dx*dy*sizeof(double), myFile);};
   void read(FILE *myFile) {fread((void*)this, 1,  3*sizeof(int)+2*sizeof(double), myFile); fread((void*)data, 1, dx*dy*sizeof(double), myFile);};
-  void set_data(double v, int ix, int iy=0){data[(iy+ny/2)*nx+ix+nx/2]=v;};
-  double get_data(int ix, int iy=0){return data[(iy+ny/2)*nx+ix+nx/2];};
+  void set_data(double v, int ix, int iy=0){data[(iy+dy/2)*dx+ix+dx/2]=v;};
+  double get_data(int ix, int iy=0){return data[(iy+dy/2)*dx+ix+dx/2];};
 
   
 	int 	x; 			/**< x-coordinate of the center of hit */