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

gap pixels should now work for 4 bit mode and a bug fix in decoding for 4 bit mode

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-10-31 12:38:42 +01:00
parent 6812961836
commit 9d4c14b724
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -114,14 +114,10 @@ void qDrawPlot::SetupWidgetWindow(){
plotTitle_prefix = ""; plotTitle_prefix = "";
plot_in_scope = 0; plot_in_scope = 0;
nPixelsX = (myDet->setDynamicRange(-1) == 4) ? nPixelsX = myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::X);
myDet->getTotalNumberOfChannels(slsDetectorDefs::X) :
myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::X);
cout<<"nPixelsX:"<<nPixelsX<<endl; cout<<"nPixelsX:"<<nPixelsX<<endl;
nPixelsY = (myDet->setDynamicRange(-1) == 4) ? nPixelsY = myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::Y);
myDet->getTotalNumberOfChannels(slsDetectorDefs::Y) :
myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::Y);
cout<<"nPixelsY:"<<nPixelsY<<endl; cout<<"nPixelsY:"<<nPixelsY<<endl;
nAnglePixelsX = 1; nAnglePixelsX = 1;
@ -571,12 +567,8 @@ void qDrawPlot::SetScanArgument(int scanArg){
maxPixelsY = 0; maxPixelsY = 0;
minPixelsY = 0; minPixelsY = 0;
nPixelsX = (myDet->setDynamicRange(-1) == 4) ? nPixelsX = myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::X);
myDet->getTotalNumberOfChannels(slsDetectorDefs::X) : nPixelsY = myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::Y);
myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::X);
nPixelsY = (myDet->setDynamicRange(-1) == 4) ?
myDet->getTotalNumberOfChannels(slsDetectorDefs::Y) :
myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::Y);
//cannot do this in between measurements , so update instantly //cannot do this in between measurements , so update instantly
if(scanArgument==qDefs::Level0){ if(scanArgument==qDefs::Level0){
//no need to check if numsteps=0,cuz otherwise this mode wont be set in plot tab //no need to check if numsteps=0,cuz otherwise this mode wont be set in plot tab
@ -1833,9 +1825,7 @@ int qDrawPlot::UpdateTrimbitPlot(bool fromDetector,bool Histogram){
if(detType == slsDetectorDefs::MYTHEN){ if(detType == slsDetectorDefs::MYTHEN){
//get trimbits //get trimbits
actualPixelsX = (myDet->setDynamicRange(-1) == 4) ? actualPixelsX = myDet->getTotalNumberOfChannels(slsDetectorDefs::X);
myDet->getTotalNumberOfChannels(slsDetectorDefs::X) :
myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::X);
if(histTrimbits) delete [] histTrimbits; histTrimbits = new double[actualPixelsX]; if(histTrimbits) delete [] histTrimbits; histTrimbits = new double[actualPixelsX];
ret = myDet->getChanRegs(histTrimbits,fromDetector); ret = myDet->getChanRegs(histTrimbits,fromDetector);
// cout << "got it!" << endl; // cout << "got it!" << endl;
@ -2172,7 +2162,6 @@ void qDrawPlot::EnableGainPlot(bool e) {
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
void qDrawPlot::toDoublePixelData(double* dest, char* source,int size, int databytes, double* gaindest) { 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;
int ibyte=0; int ibyte=0;
@ -2185,7 +2174,7 @@ void qDrawPlot::toDoublePixelData(double* dest, char* source,int size, int datab
case 4: case 4:
for (ibyte = 0; ibyte < databytes; ++ibyte) { for (ibyte = 0; ibyte < databytes; ++ibyte) {
cbyte = source[ibyte]; cbyte = source[ibyte];
for (halfbyte = 0; halfbyte < 2; ++halfbyte) { for (halfbyte = 1; halfbyte >= 0; --halfbyte) {
dest[ichan] = (cbyte >> (halfbyte * 4)) & 0xf; dest[ichan] = (cbyte >> (halfbyte * 4)) & 0xf;
++ichan; ++ichan;
} }