2d pedestal implemented

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@193 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2013-05-28 07:04:53 +00:00
parent 4f1dfe8b87
commit b915844822

View File

@ -886,16 +886,13 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){
// Titles // Titles
imageTitle = temp_title; imageTitle = temp_title;
// manufacture data for now // manufacture data for now
/* /* default data
for(unsigned int px=0;px<nPixelsX;px++) for(unsigned int px=0;px<nPixelsX;px++)
for(unsigned int py=0;py<nPixelsY;py++) for(unsigned int py=0;py<nPixelsY;py++)
lastImageArray[py*nPixelsX+px] = sqrt(pow(currentFrame+1,2)*pow(double(px)-nPixelsX/2,2)/pow(nPixelsX/2,2)/pow(number_of_exposures+1,2) + pow(double(py)-nPixelsY/2,2)/pow(nPixelsY/2,2))/sqrt(2); lastImageArray[py*nPixelsX+px] = sqrt(pow(currentFrame+1,2)*pow(double(px)-nPixelsX/2,2)/pow(nPixelsX/2,2)/pow(number_of_exposures+1,2) + pow(double(py)-nPixelsY/2,2)/pow(nPixelsY/2,2))/sqrt(2);
*/ */
// copy data // copy data
/*memcpy(lastImageArray,data->values,nPixelsX*nPixelsY*sizeof(double));*/ /*memcpy(lastImageArray,data->values,nPixelsX*nPixelsY*sizeof(double));*/
//normal data //normal data
if(resetPedestal){ if(resetPedestal){
memcpy(lastImageArray,data->values,nPixelsX*nPixelsY*sizeof(double)); memcpy(lastImageArray,data->values,nPixelsX*nPixelsY*sizeof(double));
@ -921,22 +918,6 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){
pedestalCount++; pedestalCount++;
} }
} }
pthread_mutex_unlock(&(last_image_complete_mutex)); pthread_mutex_unlock(&(last_image_complete_mutex));
} }