From d9444121b74388fae55c8e568dd14cd816c5430e Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@af1100a4-978c-4157-bff7-07162d2ba061>
Date: Fri, 16 Aug 2013 14:07:46 +0000
Subject: [PATCH] pedestal correction

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@229 af1100a4-978c-4157-bff7-07162d2ba061
---
 slsDetectorGui/src/qDrawPlot.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp
index bf0e6019d..d071fb1d3 100644
--- a/slsDetectorGui/src/qDrawPlot.cpp
+++ b/slsDetectorGui/src/qDrawPlot.cpp
@@ -897,20 +897,19 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){
 
 				//recalculating pedestal
 				if(startPedestalCal){
-
 					//start adding frames to get to the pedestal value
 					if(pedestalCount<NUM_PEDESTAL_FRAMES){
 						for(unsigned int px=0;px<nPixelsX;px++)
-							tempPedestalVals[px] += data->values[px];//cout<<"tempPedestalVals[200]:"<<tempPedestalVals[200]<<endl;
+							tempPedestalVals[px] += data->values[px];
 						memcpy(histYAxis[0],data->values,nPixelsX*sizeof(double));
 						pedestalCount++;
 					}
 					//calculate the pedestal value
-					else if(pedestalCount==NUM_PEDESTAL_FRAMES){
+					if(pedestalCount==NUM_PEDESTAL_FRAMES){
 						cout << "Pedestal Calculated" << endl;
 						for(unsigned int px=0;px<nPixelsX;px++)
-							tempPedestalVals[px] = tempPedestalVals[px]/(double)NUM_PEDESTAL_FRAMES;//cout<<"tempPedestalVals[200]:"<<tempPedestalVals[200]<<endl;
-						memcpy(pedestalVals,tempPedestalVals,nPixelsX*sizeof(double));//cout<<"pedestalVals[200]:"<<pedestalVals[200]<<endl;
+							tempPedestalVals[px] = tempPedestalVals[px]/(double)NUM_PEDESTAL_FRAMES;
+						memcpy(pedestalVals,tempPedestalVals,nPixelsX*sizeof(double));
 						startPedestalCal = 0;
 					}
 				}
@@ -944,15 +943,15 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){
 				imageTitle = temp_title;
 				//recalculating pedestal
 				if(startPedestalCal){
-					pedestalCount++;
 					//start adding frames to get to the pedestal value
 					if(pedestalCount<NUM_PEDESTAL_FRAMES){
 						for(unsigned int px=0;px<(nPixelsX*nPixelsY);px++)
 							tempPedestalVals[px] += data->values[px];
 						memcpy(lastImageArray,data->values,nPixelsX*nPixelsY*sizeof(double));
+						pedestalCount++;
 					}
 					//calculate the pedestal value
-					else if(pedestalCount==NUM_PEDESTAL_FRAMES){
+					if(pedestalCount==NUM_PEDESTAL_FRAMES){
 						cout << "Pedestal Calculated" << endl;
 						for(unsigned int px=0;px<(nPixelsX*nPixelsY);px++)
 							tempPedestalVals[px] = tempPedestalVals[px]/(double)NUM_PEDESTAL_FRAMES;