adopted unzoom to "improvement" r33665 in root-5.27.04 also for difference Fourier. Fixed unzoom bug in musrt0 (MUSR-77)

This commit is contained in:
nemu 2010-09-15 12:21:37 +00:00
parent 12511fe662
commit 36d6455783
2 changed files with 34 additions and 0 deletions

View File

@ -3030,6 +3030,7 @@ void PMusrCanvas::PlotFourier()
fHistoFrame = fDataTheoryPad->DrawFrame(xmin, 1.05*ymin, xmax, 1.05*ymax); fHistoFrame = fDataTheoryPad->DrawFrame(xmin, 1.05*ymin, xmax, 1.05*ymax);
// set ranges for Fourier and Fourier theory
for (UInt_t i=0; i<fData.size(); i++) { for (UInt_t i=0; i<fData.size(); i++) {
fData[i].dataFourierPwr->GetXaxis()->SetRangeUser(xmin, xmax); fData[i].dataFourierPwr->GetXaxis()->SetRangeUser(xmin, xmax);
fData[i].dataFourierPwr->GetYaxis()->SetRangeUser(1.05*ymin, 1.05*ymax); 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); fHistoFrame = fDataTheoryPad->DrawFrame(xmin, 1.05*ymin, xmax, 1.05*ymax);
// set ranges for Fourier difference
for (UInt_t i=0; i<fData.size(); i++) {
fData[i].diffFourierRe->GetXaxis()->SetRangeUser(xmin, xmax);
fData[i].diffFourierRe->GetYaxis()->SetRangeUser(1.05*ymin, 1.05*ymax);
}
// set x-axis title // set x-axis title
fHistoFrame->GetXaxis()->SetTitle(xAxisTitle.Data()); fHistoFrame->GetXaxis()->SetTitle(xAxisTitle.Data());
@ -3212,6 +3219,12 @@ void PMusrCanvas::PlotFourierDifference()
} }
fHistoFrame = fDataTheoryPad->DrawFrame(xmin, 1.05*ymin, xmax, 1.05*ymax); fHistoFrame = fDataTheoryPad->DrawFrame(xmin, 1.05*ymin, xmax, 1.05*ymax);
// set ranges for Fourier difference
for (UInt_t i=0; i<fData.size(); i++) {
fData[i].diffFourierIm->GetXaxis()->SetRangeUser(xmin, xmax);
fData[i].diffFourierIm->GetYaxis()->SetRangeUser(1.05*ymin, 1.05*ymax);
}
// set x-axis title // set x-axis title
fHistoFrame->GetXaxis()->SetTitle(xAxisTitle.Data()); fHistoFrame->GetXaxis()->SetTitle(xAxisTitle.Data());
@ -3258,6 +3271,14 @@ void PMusrCanvas::PlotFourierDifference()
} }
fHistoFrame = fDataTheoryPad->DrawFrame(xmin, 1.05*ymin, xmax, 1.05*ymax); fHistoFrame = fDataTheoryPad->DrawFrame(xmin, 1.05*ymin, xmax, 1.05*ymax);
// set ranges for Fourier difference
for (UInt_t i=0; i<fData.size(); i++) {
fData[i].diffFourierRe->GetXaxis()->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 // set x-axis title
fHistoFrame->GetXaxis()->SetTitle(xAxisTitle.Data()); fHistoFrame->GetXaxis()->SetTitle(xAxisTitle.Data());
@ -3300,6 +3321,12 @@ void PMusrCanvas::PlotFourierDifference()
// set x-axis title // set x-axis title
fHistoFrame->GetXaxis()->SetTitle(xAxisTitle.Data()); fHistoFrame->GetXaxis()->SetTitle(xAxisTitle.Data());
// set ranges for Fourier difference
for (UInt_t i=0; i<fData.size(); i++) {
fData[i].diffFourierPwr->GetXaxis()->SetRangeUser(xmin, xmax);
fData[i].diffFourierPwr->GetYaxis()->SetRangeUser(1.05*ymin, 1.05*ymax);
}
// set y-axis title // set y-axis title
fHistoFrame->GetYaxis()->SetTitle("Power Fourier"); fHistoFrame->GetYaxis()->SetTitle("Power Fourier");
@ -3333,6 +3360,12 @@ void PMusrCanvas::PlotFourierDifference()
} }
fHistoFrame = fDataTheoryPad->DrawFrame(xmin, 1.05*ymin, xmax, 1.05*ymax); fHistoFrame = fDataTheoryPad->DrawFrame(xmin, 1.05*ymin, xmax, 1.05*ymax);
// set ranges for Fourier difference
for (UInt_t i=0; i<fData.size(); i++) {
fData[i].diffFourierPhase->GetXaxis()->SetRangeUser(xmin, xmax);
fData[i].diffFourierPhase->GetYaxis()->SetRangeUser(1.05*ymin, 1.05*ymax);
}
// set x-axis title // set x-axis title
fHistoFrame->GetXaxis()->SetTitle(xAxisTitle.Data()); fHistoFrame->GetXaxis()->SetTitle(xAxisTitle.Data());

View File

@ -1108,6 +1108,7 @@ void PMusrT0::SetBkgLastChannel()
void PMusrT0::UnZoom() void PMusrT0::UnZoom()
{ {
fHisto->GetXaxis()->UnZoom(); fHisto->GetXaxis()->UnZoom();
fHisto->GetYaxis()->UnZoom();
fMainCanvas->Modified(); // needed that Update is actually working fMainCanvas->Modified(); // needed that Update is actually working
fMainCanvas->Update(); fMainCanvas->Update();