diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index 1883fff53..c46069e7d 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -113,8 +113,17 @@ void qDrawPlot::SetupWidgetWindow(){ plotTitle = ""; plotTitle_prefix = ""; plot_in_scope = 0; - nPixelsX = myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::X); cout<<"nPixelsX:"<getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::Y); cout<<"nPixelsY:"<setDynamicRange(-1) == 4) ? + myDet->getTotalNumberOfChannels(slsDetectorDefs::X) : + myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::X); + cout<<"nPixelsX:"<setDynamicRange(-1) == 4) ? + myDet->getTotalNumberOfChannels(slsDetectorDefs::Y) : + myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::Y); + cout<<"nPixelsY:"<getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::X); - nPixelsY = myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::Y); + nPixelsX = (myDet->setDynamicRange(-1) == 4) ? + myDet->getTotalNumberOfChannels(slsDetectorDefs::X) : + 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 if(scanArgument==qDefs::Level0){ //no need to check if numsteps=0,cuz otherwise this mode wont be set in plot tab @@ -1820,7 +1833,9 @@ int qDrawPlot::UpdateTrimbitPlot(bool fromDetector,bool Histogram){ if(detType == slsDetectorDefs::MYTHEN){ //get trimbits - actualPixelsX = myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::X); + actualPixelsX = (myDet->setDynamicRange(-1) == 4) ? + myDet->getTotalNumberOfChannels(slsDetectorDefs::X) : + myDet->getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::X); if(histTrimbits) delete [] histTrimbits; histTrimbits = new double[actualPixelsX]; ret = myDet->getChanRegs(histTrimbits,fromDetector); // cout << "got it!" << endl;