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

Merge branch 'realgappixels' into gappixels

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-10-03 10:49:47 +02:00
commit c594870fdd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -113,8 +113,8 @@ void qDrawPlot::SetupWidgetWindow(){
plotTitle = ""; plotTitle = "";
plotTitle_prefix = ""; plotTitle_prefix = "";
plot_in_scope = 0; plot_in_scope = 0;
nPixelsX = myDet->getTotalNumberOfChannels(slsDetectorDefs::X); cout<<"nPixelsX:"<<nPixelsX<<endl; nPixelsX = myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::X); cout<<"nPixelsX:"<<nPixelsX<<endl;
nPixelsY = myDet->getTotalNumberOfChannels(slsDetectorDefs::Y); cout<<"nPixelsY:"<<nPixelsY<<endl; nPixelsY = myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::Y); cout<<"nPixelsY:"<<nPixelsY<<endl;
nAnglePixelsX = 1; nAnglePixelsX = 1;
minPixelsY = 0; minPixelsY = 0;
maxPixelsY = 0; maxPixelsY = 0;
@ -562,8 +562,8 @@ void qDrawPlot::SetScanArgument(int scanArg){
maxPixelsY = 0; maxPixelsY = 0;
minPixelsY = 0; minPixelsY = 0;
nPixelsX = myDet->getTotalNumberOfChannels(slsDetectorDefs::X); nPixelsX = myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::X);
nPixelsY = myDet->getTotalNumberOfChannels(slsDetectorDefs::Y); nPixelsY = 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
@ -1819,7 +1819,7 @@ int qDrawPlot::UpdateTrimbitPlot(bool fromDetector,bool Histogram){
if(detType == slsDetectorDefs::MYTHEN){ if(detType == slsDetectorDefs::MYTHEN){
//get trimbits //get trimbits
actualPixelsX = myDet->getTotalNumberOfChannels(slsDetectorDefs::X); actualPixelsX = 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;