mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-12 12:57:13 +02:00
pedestal correction
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@229 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
@ -897,20 +897,19 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){
|
|||||||
|
|
||||||
//recalculating pedestal
|
//recalculating pedestal
|
||||||
if(startPedestalCal){
|
if(startPedestalCal){
|
||||||
|
|
||||||
//start adding frames to get to the pedestal value
|
//start adding frames to get to the pedestal value
|
||||||
if(pedestalCount<NUM_PEDESTAL_FRAMES){
|
if(pedestalCount<NUM_PEDESTAL_FRAMES){
|
||||||
for(unsigned int px=0;px<nPixelsX;px++)
|
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));
|
memcpy(histYAxis[0],data->values,nPixelsX*sizeof(double));
|
||||||
pedestalCount++;
|
pedestalCount++;
|
||||||
}
|
}
|
||||||
//calculate the pedestal value
|
//calculate the pedestal value
|
||||||
else if(pedestalCount==NUM_PEDESTAL_FRAMES){
|
if(pedestalCount==NUM_PEDESTAL_FRAMES){
|
||||||
cout << "Pedestal Calculated" << endl;
|
cout << "Pedestal Calculated" << endl;
|
||||||
for(unsigned int px=0;px<nPixelsX;px++)
|
for(unsigned int px=0;px<nPixelsX;px++)
|
||||||
tempPedestalVals[px] = tempPedestalVals[px]/(double)NUM_PEDESTAL_FRAMES;//cout<<"tempPedestalVals[200]:"<<tempPedestalVals[200]<<endl;
|
tempPedestalVals[px] = tempPedestalVals[px]/(double)NUM_PEDESTAL_FRAMES;
|
||||||
memcpy(pedestalVals,tempPedestalVals,nPixelsX*sizeof(double));//cout<<"pedestalVals[200]:"<<pedestalVals[200]<<endl;
|
memcpy(pedestalVals,tempPedestalVals,nPixelsX*sizeof(double));
|
||||||
startPedestalCal = 0;
|
startPedestalCal = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -944,15 +943,15 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){
|
|||||||
imageTitle = temp_title;
|
imageTitle = temp_title;
|
||||||
//recalculating pedestal
|
//recalculating pedestal
|
||||||
if(startPedestalCal){
|
if(startPedestalCal){
|
||||||
pedestalCount++;
|
|
||||||
//start adding frames to get to the pedestal value
|
//start adding frames to get to the pedestal value
|
||||||
if(pedestalCount<NUM_PEDESTAL_FRAMES){
|
if(pedestalCount<NUM_PEDESTAL_FRAMES){
|
||||||
for(unsigned int px=0;px<(nPixelsX*nPixelsY);px++)
|
for(unsigned int px=0;px<(nPixelsX*nPixelsY);px++)
|
||||||
tempPedestalVals[px] += data->values[px];
|
tempPedestalVals[px] += data->values[px];
|
||||||
memcpy(lastImageArray,data->values,nPixelsX*nPixelsY*sizeof(double));
|
memcpy(lastImageArray,data->values,nPixelsX*nPixelsY*sizeof(double));
|
||||||
|
pedestalCount++;
|
||||||
}
|
}
|
||||||
//calculate the pedestal value
|
//calculate the pedestal value
|
||||||
else if(pedestalCount==NUM_PEDESTAL_FRAMES){
|
if(pedestalCount==NUM_PEDESTAL_FRAMES){
|
||||||
cout << "Pedestal Calculated" << endl;
|
cout << "Pedestal Calculated" << endl;
|
||||||
for(unsigned int px=0;px<(nPixelsX*nPixelsY);px++)
|
for(unsigned int px=0;px<(nPixelsX*nPixelsY);px++)
|
||||||
tempPedestalVals[px] = tempPedestalVals[px]/(double)NUM_PEDESTAL_FRAMES;
|
tempPedestalVals[px] = tempPedestalVals[px]/(double)NUM_PEDESTAL_FRAMES;
|
||||||
|
Reference in New Issue
Block a user