From 36d645578313f655df1bc10ba0e4ec64ecc5c82d Mon Sep 17 00:00:00 2001 From: nemu Date: Wed, 15 Sep 2010 12:21:37 +0000 Subject: [PATCH] adopted unzoom to "improvement" r33665 in root-5.27.04 also for difference Fourier. Fixed unzoom bug in musrt0 (MUSR-77) --- src/classes/PMusrCanvas.cpp | 33 +++++++++++++++++++++++++++++++++ src/classes/PMusrT0.cpp | 1 + 2 files changed, 34 insertions(+) diff --git a/src/classes/PMusrCanvas.cpp b/src/classes/PMusrCanvas.cpp index e9e7f1db..7ed7113a 100644 --- a/src/classes/PMusrCanvas.cpp +++ b/src/classes/PMusrCanvas.cpp @@ -3030,6 +3030,7 @@ void PMusrCanvas::PlotFourier() fHistoFrame = fDataTheoryPad->DrawFrame(xmin, 1.05*ymin, xmax, 1.05*ymax); + // set ranges for Fourier and Fourier theory for (UInt_t i=0; iGetXaxis()->SetRangeUser(xmin, xmax); fData[i].dataFourierPwr->GetYaxis()->SetRangeUser(1.05*ymin, 1.05*ymax); @@ -3174,6 +3175,12 @@ void PMusrCanvas::PlotFourierDifference() fHistoFrame = fDataTheoryPad->DrawFrame(xmin, 1.05*ymin, xmax, 1.05*ymax); + // set ranges for Fourier difference + for (UInt_t i=0; iGetXaxis()->SetRangeUser(xmin, xmax); + fData[i].diffFourierRe->GetYaxis()->SetRangeUser(1.05*ymin, 1.05*ymax); + } + // set x-axis title fHistoFrame->GetXaxis()->SetTitle(xAxisTitle.Data()); @@ -3212,6 +3219,12 @@ void PMusrCanvas::PlotFourierDifference() } fHistoFrame = fDataTheoryPad->DrawFrame(xmin, 1.05*ymin, xmax, 1.05*ymax); + // set ranges for Fourier difference + for (UInt_t i=0; iGetXaxis()->SetRangeUser(xmin, xmax); + fData[i].diffFourierIm->GetYaxis()->SetRangeUser(1.05*ymin, 1.05*ymax); + } + // set x-axis title fHistoFrame->GetXaxis()->SetTitle(xAxisTitle.Data()); @@ -3258,6 +3271,14 @@ void PMusrCanvas::PlotFourierDifference() } fHistoFrame = fDataTheoryPad->DrawFrame(xmin, 1.05*ymin, xmax, 1.05*ymax); + // set ranges for Fourier difference + for (UInt_t i=0; iGetXaxis()->SetRangeUser(xmin, xmax); + fData[i].diffFourierRe->GetYaxis()->SetRangeUser(1.05*ymin, 1.05*ymax); + fData[i].diffFourierIm->GetXaxis()->SetRangeUser(xmin, xmax); + fData[i].diffFourierIm->GetYaxis()->SetRangeUser(1.05*ymin, 1.05*ymax); + } + // set x-axis title fHistoFrame->GetXaxis()->SetTitle(xAxisTitle.Data()); @@ -3300,6 +3321,12 @@ void PMusrCanvas::PlotFourierDifference() // set x-axis title fHistoFrame->GetXaxis()->SetTitle(xAxisTitle.Data()); + // set ranges for Fourier difference + for (UInt_t i=0; iGetXaxis()->SetRangeUser(xmin, xmax); + fData[i].diffFourierPwr->GetYaxis()->SetRangeUser(1.05*ymin, 1.05*ymax); + } + // set y-axis title fHistoFrame->GetYaxis()->SetTitle("Power Fourier"); @@ -3333,6 +3360,12 @@ void PMusrCanvas::PlotFourierDifference() } fHistoFrame = fDataTheoryPad->DrawFrame(xmin, 1.05*ymin, xmax, 1.05*ymax); + // set ranges for Fourier difference + for (UInt_t i=0; iGetXaxis()->SetRangeUser(xmin, xmax); + fData[i].diffFourierPhase->GetYaxis()->SetRangeUser(1.05*ymin, 1.05*ymax); + } + // set x-axis title fHistoFrame->GetXaxis()->SetTitle(xAxisTitle.Data()); diff --git a/src/classes/PMusrT0.cpp b/src/classes/PMusrT0.cpp index 711f1c53..ad381912 100644 --- a/src/classes/PMusrT0.cpp +++ b/src/classes/PMusrT0.cpp @@ -1108,6 +1108,7 @@ void PMusrT0::SetBkgLastChannel() void PMusrT0::UnZoom() { fHisto->GetXaxis()->UnZoom(); + fHisto->GetYaxis()->UnZoom(); fMainCanvas->Modified(); // needed that Update is actually working fMainCanvas->Update();