fix logy problem.

This commit is contained in:
suter_a 2017-05-29 18:02:31 +02:00
parent 2b7a391bbb
commit bce9326f06

View File

@ -4602,14 +4602,8 @@ void PMusrCanvas::PlotData(Bool_t unzoom)
dataYmax = GetMaximum(fData[i].data, dataXmin, dataXmax); dataYmax = GetMaximum(fData[i].data, dataXmin, dataXmax);
} }
Double_t dd = 0.05*fabs(dataYmax-dataYmin); Double_t dd = 0.05*fabs(dataYmax-dataYmin);
if (!fMsrHandler->GetMsrPlotList()->at(fPlotNumber).fLogY) { dataYmin -= dd;
dataYmin -= dd; dataYmax += dd;
dataYmax += dd;
} else {
if (dataYmin < 0)
dataYmin = 0.1;
dataYmax += dd;
}
} }
} else { // set the x-/y-range to the previous fHistoFrame range } else { // set the x-/y-range to the previous fHistoFrame range
dataXmin = xmin; dataXmin = xmin;
@ -4627,16 +4621,13 @@ void PMusrCanvas::PlotData(Bool_t unzoom)
dataYmax = GetMaximum(fData[i].data, dataXmin, dataXmax); dataYmax = GetMaximum(fData[i].data, dataXmin, dataXmax);
} }
Double_t dd = 0.05*fabs(dataYmax-dataYmin); Double_t dd = 0.05*fabs(dataYmax-dataYmin);
if (!fMsrHandler->GetMsrPlotList()->at(fPlotNumber).fLogY) { dataYmin -= dd;
dataYmin -= dd; dataYmax += dd;
dataYmax += dd;
} else {
if (dataYmin < 0)
dataYmin = 0.1;
dataYmax += dd;
}
} }
} }
if (fMsrHandler->GetMsrPlotList()->at(fPlotNumber).fLogY) {
dataYmin = 1.0e-4 * dataYmax;
}
// create histo frame in order to plot histograms possibly with different x-frames // create histo frame in order to plot histograms possibly with different x-frames
fHistoFrame = fDataTheoryPad->DrawFrame(dataXmin, dataYmin, dataXmax, dataYmax); fHistoFrame = fDataTheoryPad->DrawFrame(dataXmin, dataYmin, dataXmax, dataYmax);
@ -4758,14 +4749,8 @@ void PMusrCanvas::PlotData(Bool_t unzoom)
dataYmax = GetMaximum(fNonMusrData[i].data, dataXmin, dataXmax); dataYmax = GetMaximum(fNonMusrData[i].data, dataXmin, dataXmax);
} }
Double_t dd = 0.05*fabs(dataYmax-dataYmin); Double_t dd = 0.05*fabs(dataYmax-dataYmin);
if (!fMsrHandler->GetMsrPlotList()->at(fPlotNumber).fLogY) { dataYmin -= dd;
dataYmin -= dd; dataYmax += dd;
dataYmax += dd;
} else {
if (dataYmin < 0)
dataYmin = 0.1;
dataYmax += dd;
}
} }
} else { // set the x-/y-range to the previous fHistoFrame range } else { // set the x-/y-range to the previous fHistoFrame range
dataXmin = xmin; dataXmin = xmin;
@ -4783,16 +4768,13 @@ void PMusrCanvas::PlotData(Bool_t unzoom)
dataYmax = GetMaximum(fNonMusrData[i].data, dataXmin, dataXmax); dataYmax = GetMaximum(fNonMusrData[i].data, dataXmin, dataXmax);
} }
Double_t dd = 0.05*fabs(dataYmax-dataYmin); Double_t dd = 0.05*fabs(dataYmax-dataYmin);
if (!fMsrHandler->GetMsrPlotList()->at(fPlotNumber).fLogY) { dataYmin -= dd;
dataYmin -= dd; dataYmax += dd;
dataYmax += dd;
} else {
if (dataYmin < 0)
dataYmin = 0.1;
dataYmax += dd;
}
} }
} }
if (fMsrHandler->GetMsrPlotList()->at(fPlotNumber).fLogY) {
dataYmin = 1.0e-4 * dataYmax;
}
// create fMultiGraphData, and add all data and theory // create fMultiGraphData, and add all data and theory
fMultiGraphData = new TMultiGraph(); fMultiGraphData = new TMultiGraph();