detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-26 16:20:03 +02:00
Code Issues Actions Packages Releases Activity

should work, but jungfrau needs debugging

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-09-29 16:43:07 +02:00
parent 9bdb361d08
commit fa79a36089
2 changed files with 57 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorGui/include/qDrawPlot.h
View File

@ -298,7 +298,7 @@ void GetStatistics(double &min, double &max, double &sum, double* array, int siz
/** /**
* Convert data from * Convert data from
*/ */
void toDoublePixelData(double* dest, char* source,int size, int databytes); void toDoublePixelData(double* dest, char* source,int size, int databytes, double* gaindest = NULL);
private slots: private slots:
/** To update plot /** To update plot
@ -592,6 +592,7 @@ SlsQt2DPlotLayout* gainplot2D;
double* gainImageArray; double* gainImageArray;
/** gain plot enable */ /** gain plot enable */
bool gainPlotEnable; bool gainPlotEnable;
bool gainDataEnable;
signals: signals:
void UpdatingPlotFinished(); void UpdatingPlotFinished();

105
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -340,6 +340,7 @@ void qDrawPlot::SetupWidgetWindow(){
plotLayout->addWidget(gainplot2D,0,4,1,1); plotLayout->addWidget(gainplot2D,0,4,1,1);
gainplot2D->hide(); gainplot2D->hide();
gainPlotEnable = false; gainPlotEnable = false;
gainDataEnable = false;
@ -839,8 +840,10 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
if(anglePlot){ if(anglePlot){
// convert char* to double // convert char* to double
double* finaldata = new double[nPixelsX*nPixelsY]; if(data->values==NULL) {
toDoublePixelData(finaldata, data->cvalues, nPixelsX*nPixelsY, data->databytes); data->values = new double[nPixelsX*nPixelsY];
toDoublePixelData(data->values, data->cvalues, nPixelsX*nPixelsY, data->databytes);
}
LockLastImageArray(); LockLastImageArray();
//set title //set title
@ -855,7 +858,7 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
histNBins = nAnglePixelsX; histNBins = nAnglePixelsX;
nHists=1; nHists=1;
memcpy(histXAngleAxis,histXAxis,nAnglePixelsX*sizeof(double)); memcpy(histXAngleAxis,histXAxis,nAnglePixelsX*sizeof(double));
memcpy(histYAngleAxis,finaldata,nAnglePixelsX*sizeof(double)); memcpy(histYAngleAxis,data->values,nAnglePixelsX*sizeof(double));
SetHistXAxisTitle("Channel Number"); SetHistXAxisTitle("Channel Number");
} }
@ -869,10 +872,10 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
#ifdef CHECKINFERROR #ifdef CHECKINFERROR
int k = 0; int k = 0;
for(int i = 0; i < data->npoints; i++){ for(int i = 0; i < data->npoints; i++){
if(isinf(finaldata[i])){ if(isinf(data->values[i])){
//cout << "*** ERROR: value at " << i << " infinity" << endl; //cout << "*** ERROR: value at " << i << " infinity" << endl;
k++; k++;
finaldata[i] = -1; data->values[i] = -1;
} }
} }
if (k>0) { if (k>0) {
@ -882,14 +885,14 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
cout << "angle min:" << m1 << endl; cout << "angle min:" << m1 << endl;
cout << "angle max:" << m2 << endl; cout << "angle max:" << m2 << endl;
cout << "angle sum:" << s1 << endl; cout << "angle sum:" << s1 << endl;
GetStatistics(m1,m2,s1,finaldata,nAnglePixelsX); GetStatistics(m1,m2,s1,data->values,nAnglePixelsX);
cout << "value min:" << m1 << endl; cout << "value min:" << m1 << endl;
cout << "value max:" << m2 << endl; cout << "value max:" << m2 << endl;
cout << "value sum:" << s1 << endl; cout << "value sum:" << s1 << endl;
} }
#endif #endif
memcpy(histXAngleAxis,data->angles,nAnglePixelsX*sizeof(double)); memcpy(histXAngleAxis,data->angles,nAnglePixelsX*sizeof(double));
memcpy(histYAngleAxis,finaldata,nAnglePixelsX*sizeof(double)); memcpy(histYAngleAxis,data->values,nAnglePixelsX*sizeof(double));
SetHistXAxisTitle("Angles"); SetHistXAxisTitle("Angles");
} }
UnlockLastImageArray(); UnlockLastImageArray();
@ -899,7 +902,6 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
#endif #endif
emit UpdatePlotSignal(); emit UpdatePlotSignal();
plotRequired = true; plotRequired = true;
delete [] finaldata;
return 0; return 0;
} }
@ -931,8 +933,15 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
} }
// convert char* to double // convert char* to double
double* finaldata = new double[nPixelsX*nPixelsY]; if(data->values == NULL) {
toDoublePixelData(finaldata, data->cvalues, nPixelsX*nPixelsY, data->databytes); data->values = new double[nPixelsX*nPixelsY];
if (gainDataEnable) {
data->dgainvalues = new double[nPixelsX*nPixelsY];
toDoublePixelData(data->values, data->cvalues, nPixelsX*nPixelsY, data->databytes, data->dgainvalues);
}
else
toDoublePixelData(data->values, data->cvalues, nPixelsX*nPixelsY, data->databytes);
}
//if scan //if scan
//alframes //alframes
@ -945,13 +954,12 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
//title //title
imageTitle = temp_title; imageTitle = temp_title;
//copy data //copy data
memcpy(lastImageArray+(currentScanDivLevel*nPixelsX),finaldata,nPixelsX*sizeof(double)); memcpy(lastImageArray+(currentScanDivLevel*nPixelsX),data->values,nPixelsX*sizeof(double));
UnlockLastImageArray(); UnlockLastImageArray();
currentFrame++; currentFrame++;
currentScanDivLevel++; currentScanDivLevel++;
emit UpdatePlotSignal(); emit UpdatePlotSignal();
plotRequired = true; plotRequired = true;
delete [] finaldata;
return 0; return 0;
} }
//file index //file index
@ -965,13 +973,12 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
//title //title
imageTitle = temp_title; imageTitle = temp_title;
//copy data //copy data
for(unsigned int px=0;px<nPixelsX;px++) lastImageArray[currentScanDivLevel*nPixelsX+px] += finaldata[px]; for(unsigned int px=0;px<nPixelsX;px++) lastImageArray[currentScanDivLevel*nPixelsX+px] += data->values[px];
UnlockLastImageArray(); UnlockLastImageArray();
currentFrame++; currentFrame++;
currentScanDivLevel++; currentScanDivLevel++;
emit UpdatePlotSignal(); emit UpdatePlotSignal();
plotRequired = true; plotRequired = true;
delete [] finaldata;
return 0; return 0;
} }
//level0 //level0
@ -992,12 +999,11 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
//title //title
imageTitle = temp_title; imageTitle = temp_title;
//copy data //copy data
for(unsigned int px=0;px<nPixelsX;px++) lastImageArray[currentScanDivLevel*nPixelsX+px] += finaldata[px]; for(unsigned int px=0;px<nPixelsX;px++) lastImageArray[currentScanDivLevel*nPixelsX+px] += data->values[px];
UnlockLastImageArray(); UnlockLastImageArray();
currentFrame++; currentFrame++;
emit UpdatePlotSignal(); emit UpdatePlotSignal();
plotRequired = true; plotRequired = true;
delete [] finaldata;
return 0; return 0;
} }
//level1 //level1
@ -1018,12 +1024,11 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
//title //title
imageTitle = temp_title; imageTitle = temp_title;
//copy data //copy data
for(unsigned int px=0;px<nPixelsX;px++) lastImageArray[currentScanDivLevel*nPixelsX+px] += finaldata[px]; for(unsigned int px=0;px<nPixelsX;px++) lastImageArray[currentScanDivLevel*nPixelsX+px] += data->values[px];
UnlockLastImageArray(); UnlockLastImageArray();
currentFrame++; currentFrame++;
emit UpdatePlotSignal(); emit UpdatePlotSignal();
plotRequired = true; plotRequired = true;
delete [] finaldata;
return 0; return 0;
} }
@ -1064,18 +1069,18 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
//frequency of intensity //frequency of intensity
if(histogramArgument == qDefs::Intensity){ if(histogramArgument == qDefs::Intensity){
//ignore outside limits //ignore outside limits
if ((finaldata[i] < histFrom) || (finaldata[i] > histTo)) if ((data->values[i] < histFrom) || (data->values[i] > histTo))
continue; continue;
//check for intervals, increment if validates //check for intervals, increment if validates
for(int j=0;j<histogramSamples.size();j++){ for(int j=0;j<histogramSamples.size();j++){
if(histogramSamples[j].interval.contains(finaldata[i])) if(histogramSamples[j].interval.contains(data->values[i]))
histogramSamples[j].value += 1; histogramSamples[j].value += 1;
} }
} }
//get sum of data pixels //get sum of data pixels
else else
val += finaldata[i]; val += data->values[i];
} }
@ -1122,8 +1127,8 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
//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] += finaldata[px]; tempPedestalVals[px] += data->values[px];
memcpy(histYAxis[0],finaldata,nPixelsX*sizeof(double)); memcpy(histYAxis[0],data->values,nPixelsX*sizeof(double));
pedestalCount++; pedestalCount++;
} }
//calculate the pedestal value //calculate the pedestal value
@ -1138,16 +1143,16 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
//normal data //normal data
if(((!pedestal)&(!accumulate)&(!binary)) || (resetAccumulate)){ if(((!pedestal)&(!accumulate)&(!binary)) || (resetAccumulate)){
memcpy(histYAxis[0],finaldata,nPixelsX*sizeof(double)); memcpy(histYAxis[0],data->values,nPixelsX*sizeof(double));
resetAccumulate = false; resetAccumulate = false;
} }
//pedestal or accumulate //pedestal or accumulate
else{ else{
double temp;//cannot overwrite cuz of accumulate double temp;//cannot overwrite cuz of accumulate
for(unsigned int px=0;px<(nPixelsX*nPixelsY);px++){ for(unsigned int px=0;px<(nPixelsX*nPixelsY);px++){
temp = finaldata[px]; temp = data->values[px];
if(pedestal) if(pedestal)
temp = finaldata[px] - (pedestalVals[px]); temp = data->values[px] - (pedestalVals[px]);
if(binary) { if(binary) {
if ((temp >= binaryFrom) && (temp <= binaryTo)) if ((temp >= binaryFrom) && (temp <= binaryTo))
temp = 1; temp = 1;
@ -1168,8 +1173,8 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
imageTitle = temp_title; imageTitle = temp_title;
//jungfrau mask gain //jungfrau mask gain
if(data->gvalues != NULL) { if(data->dgainvalues != NULL) {
memcpy(gainImageArray, data->gvalues, nPixelsX*nPixelsY*sizeof(double)); memcpy(gainImageArray, data->dgainvalues, nPixelsX*nPixelsY*sizeof(double));
gainPlotEnable = true; gainPlotEnable = true;
}else }else
gainPlotEnable = false; gainPlotEnable = false;
@ -1180,8 +1185,8 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
//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] += finaldata[px]; tempPedestalVals[px] += data->values[px];
memcpy(lastImageArray,finaldata,nPixelsX*nPixelsY*sizeof(double)); memcpy(lastImageArray,data->values,nPixelsX*nPixelsY*sizeof(double));
pedestalCount++; pedestalCount++;
} }
//calculate the pedestal value //calculate the pedestal value
@ -1196,16 +1201,16 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
//normal data //normal data
if(((!pedestal)&(!accumulate)&(!binary)) || (resetAccumulate)){ if(((!pedestal)&(!accumulate)&(!binary)) || (resetAccumulate)){
memcpy(lastImageArray,finaldata,nPixelsX*nPixelsY*sizeof(double)); memcpy(lastImageArray,data->values,nPixelsX*nPixelsY*sizeof(double));
resetAccumulate = false; resetAccumulate = false;
} }
//pedestal or accumulate or binary //pedestal or accumulate or binary
else{ else{
double temp; double temp;
for(unsigned int px=0;px<(nPixelsX*nPixelsY);px++){ for(unsigned int px=0;px<(nPixelsX*nPixelsY);px++){
temp = finaldata[px]; temp = data->values[px];
if(pedestal) if(pedestal)
temp = finaldata[px] - (pedestalVals[px]); temp = data->values[px] - (pedestalVals[px]);
if(binary) { if(binary) {
if ((temp >= binaryFrom) && (temp <= binaryTo)) if ((temp >= binaryFrom) && (temp <= binaryTo))
temp = 1; temp = 1;
@ -1224,7 +1229,6 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
}*/ }*/
UnlockLastImageArray(); UnlockLastImageArray();
delete [] finaldata;
#ifdef VERYVERBOSE #ifdef VERYVERBOSE
cprintf(BLUE,"currentframe:%d \tcurrentframeindex:%d\n",currentFrame,currentFrameIndex); cprintf(BLUE,"currentframe:%d \tcurrentframeindex:%d\n",currentFrame,currentFrameIndex);
#endif #endif
@ -1891,7 +1895,7 @@ int qDrawPlot::UpdateTrimbitPlot(bool fromDetector,bool Histogram){
//fill histogram values //fill histogram values
int value = 0; int value = 0;
for(i=0;i<actualPixelsX;i++){ for(i=0;i<actualPixelsX;i++){
if( (histTrimbits[i] <= TRIM_HISTOGRAM_XMAX) && (histTrimbits[i] >= 0)){//if(histogramSamples[j].interval.contaifinaldataues[i])) if( (histTrimbits[i] <= TRIM_HISTOGRAM_XMAX) && (histTrimbits[i] >= 0)){//if(histogramSamples[j].interval.contains(data->values[i]))
value = (int) histTrimbits[i]; value = (int) histTrimbits[i];
histogramSamples[value].value += 1; histogramSamples[value].value += 1;
} }
@ -2143,15 +2147,15 @@ void qDrawPlot::GetStatistics(double &min, double &max, double &sum, double* arr
void qDrawPlot::EnableGainPlot(bool e) { void qDrawPlot::EnableGainPlot(bool e) {
#ifdef VERBOSE #ifdef VERBOSE
cout << "Setting Gain Plot enable to " << e << endl; cout << "Setting Gain Data enable to " << e << endl;
#endif #endif
myDet->setGainDataEnableinDataCallback(e); gainDataEnable = e;
} }
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
void qDrawPlot::toDoublePixelData(double* dest, char* source,int size, int databytes) { void qDrawPlot::toDoublePixelData(double* dest, char* source,int size, int databytes, double* gaindest) {
int dr = ((double)databytes/(double)size)*8; int dr = ((double)databytes/(double)size)*8;
int ichan=0; int ichan=0;
@ -2173,29 +2177,30 @@ void qDrawPlot::toDoublePixelData(double* dest, char* source,int size, int datab
break; break;
case 8: case 8:
for (ichan = 0; ichan < databytes; ++ichan) for (ichan = 0; ichan < databytes; ++ichan) {
dest[ichan] = source[ichan]; dest[ichan] = *((u_int8_t*)source);
++source;
}
break; break;
case 16: case 16:
for (ichan = 0; ichan < size; ++ichan) { for (ichan = 0; ichan < size; ++ichan) {
dest[ichan] = *((u_int16_t*)source); if(gaindest!=NULL) {
gaindest[ichan] = ((*((u_int16_t*)source))& 0xC000);
dest[ichan] = ((*((u_int16_t*)source))& 0x3FFF);
}else
dest[ichan] = *((u_int16_t*)source);
source += 2; source += 2;
} }
break; break;
default: default:
if (detType == slsDetectorDefs::MYTHEN) { for (ichan=0; ichan < size; ++ichan) {
for (ichan=0; ichan < size; ++ichan) { if (detType == slsDetectorDefs::MYTHEN)
dest[ichan] = (*((u_int32_t*)source) & mask); dest[ichan] = (*((u_int32_t*)source) & mask);
source += 4; else
}
}
else {
for (ichan=0; ichan < size; ++ichan) {
dest[ichan] = *((u_int32_t*)source); dest[ichan] = *((u_int32_t*)source);
source += 4; source += 4;
}
} }
break; break;
} }