Merged muonspin/musrfit/root6 into master
This commit is contained in:
@@ -1582,7 +1582,9 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
|
||||
|
||||
switch (fPlotType) {
|
||||
case MSR_PLOT_SINGLE_HISTO:
|
||||
case MSR_PLOT_SINGLE_HISTO_RRF:
|
||||
case MSR_PLOT_ASYM:
|
||||
case MSR_PLOT_ASYM_RRF:
|
||||
case MSR_PLOT_MU_MINUS:
|
||||
if (fDifferenceView) { // difference view plot
|
||||
switch (fCurrentPlotView) {
|
||||
@@ -4593,14 +4595,8 @@ void PMusrCanvas::PlotData(Bool_t unzoom)
|
||||
dataYmax = GetMaximum(fData[i].data, dataXmin, dataXmax);
|
||||
}
|
||||
Double_t dd = 0.05*fabs(dataYmax-dataYmin);
|
||||
if (!fMsrHandler->GetMsrPlotList()->at(fPlotNumber).fLogY) {
|
||||
dataYmin -= dd;
|
||||
dataYmax += dd;
|
||||
} else {
|
||||
if (dataYmin < 0)
|
||||
dataYmin = 0.1;
|
||||
dataYmax += dd;
|
||||
}
|
||||
dataYmin -= dd;
|
||||
dataYmax += dd;
|
||||
}
|
||||
} else { // set the x-/y-range to the previous fHistoFrame range
|
||||
dataXmin = xmin;
|
||||
@@ -4618,16 +4614,13 @@ void PMusrCanvas::PlotData(Bool_t unzoom)
|
||||
dataYmax = GetMaximum(fData[i].data, dataXmin, dataXmax);
|
||||
}
|
||||
Double_t dd = 0.05*fabs(dataYmax-dataYmin);
|
||||
if (!fMsrHandler->GetMsrPlotList()->at(fPlotNumber).fLogY) {
|
||||
dataYmin -= dd;
|
||||
dataYmax += dd;
|
||||
} else {
|
||||
if (dataYmin < 0)
|
||||
dataYmin = 0.1;
|
||||
dataYmax += dd;
|
||||
}
|
||||
dataYmin -= dd;
|
||||
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
|
||||
fHistoFrame = fDataTheoryPad->DrawFrame(dataXmin, dataYmin, dataXmax, dataYmax);
|
||||
@@ -4756,14 +4749,8 @@ void PMusrCanvas::PlotData(Bool_t unzoom)
|
||||
dataYmax = GetMaximum(fNonMusrData[i].data, dataXmin, dataXmax);
|
||||
}
|
||||
Double_t dd = 0.05*fabs(dataYmax-dataYmin);
|
||||
if (!fMsrHandler->GetMsrPlotList()->at(fPlotNumber).fLogY) {
|
||||
dataYmin -= dd;
|
||||
dataYmax += dd;
|
||||
} else {
|
||||
if (dataYmin < 0)
|
||||
dataYmin = 0.1;
|
||||
dataYmax += dd;
|
||||
}
|
||||
dataYmin -= dd;
|
||||
dataYmax += dd;
|
||||
}
|
||||
} else { // set the x-/y-range to the previous fHistoFrame range
|
||||
dataXmin = xmin;
|
||||
@@ -4781,16 +4768,14 @@ void PMusrCanvas::PlotData(Bool_t unzoom)
|
||||
dataYmax = GetMaximum(fNonMusrData[i].data, dataXmin, dataXmax);
|
||||
}
|
||||
Double_t dd = 0.05*fabs(dataYmax-dataYmin);
|
||||
if (!fMsrHandler->GetMsrPlotList()->at(fPlotNumber).fLogY) {
|
||||
dataYmin -= dd;
|
||||
dataYmax += dd;
|
||||
} else {
|
||||
if (dataYmin < 0)
|
||||
dataYmin = 0.1;
|
||||
dataYmax += dd;
|
||||
}
|
||||
dataYmin -= dd;
|
||||
dataYmax += dd;
|
||||
}
|
||||
}
|
||||
if (fMsrHandler->GetMsrPlotList()->at(fPlotNumber).fLogY) {
|
||||
if (dataYmin <= 0.0)
|
||||
dataYmin = 1.0e-4 * dataYmax;
|
||||
}
|
||||
|
||||
// create fMultiGraphData, and add all data and theory
|
||||
fMultiGraphData = new TMultiGraph();
|
||||
|
||||
Reference in New Issue
Block a user