LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Merged muonspin/musrfit:root6 into master

Browse Source
This commit is contained in:
Zaher Salman 2022-04-27 10:46:43 +02:00
commit e37dede866
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/classes/PMusrCanvas.cpp
View File

@ -1225,7 +1225,6 @@ void PMusrCanvas::HandleCmdKey(Int_t event, Int_t x, Int_t y, TObject *selected)
PlotFourierDifference(); PlotFourierDifference();
break; break;
case kFourierDiff: // show difference between the Fourier data and the Fourier theory case kFourierDiff: // show difference between the Fourier data and the Fourier theory
CleanupFourierDifference();
HandleFourierDifference(); HandleFourierDifference();
PlotFourierDifference(); PlotFourierDifference();
break; break;
@ -3866,7 +3865,7 @@ void PMusrCanvas::HandleAverage()
} }
if (fData[0].diffFourierRe != nullptr) { if (fData[0].diffFourierRe != nullptr) {
name = TString(fData[0].diffFourierRe->GetTitle()) + "_avg"; name = TString(fData[0].diffFourierRe->GetTitle()) + "_avg";
fDataAvg.diff = new TH1F(name, name, fData[0].diffFourierRe->GetNbinsX(), fDataAvg.diffFourierRe = new TH1F(name, name, fData[0].diffFourierRe->GetNbinsX(),
fData[0].diffFourierRe->GetXaxis()->GetXmin(), fData[0].diffFourierRe->GetXaxis()->GetXmin(),
fData[0].diffFourierRe->GetXaxis()->GetXmax()); fData[0].diffFourierRe->GetXaxis()->GetXmax());
} }
@ -4126,10 +4125,10 @@ void PMusrCanvas::HandleAverage()
fDataAvg.diffFourierPhase->SetBinContent(i, dval/fData.size()); fDataAvg.diffFourierPhase->SetBinContent(i, dval/fData.size());
} }
// set marker color, line color, maker size, marker type // set marker color, line color, maker size, marker type
fDataAvg.diffFourierPhase->SetMarkerColor(fData[0].dataFourierPhase->GetMarkerColor()); fDataAvg.diffFourierPhase->SetMarkerColor(fData[0].diffFourierPhase->GetMarkerColor());
fDataAvg.diffFourierPhase->SetLineColor(fData[0].dataFourierPhase->GetLineColor()); fDataAvg.diffFourierPhase->SetLineColor(fData[0].diffFourierPhase->GetLineColor());
fDataAvg.diffFourierPhase->SetMarkerSize(fData[0].dataFourierPhase->GetMarkerSize()); fDataAvg.diffFourierPhase->SetMarkerSize(fData[0].diffFourierPhase->GetMarkerSize());
fDataAvg.diffFourierPhase->SetMarkerStyle(fData[0].dataFourierPhase->GetMarkerStyle()); fDataAvg.diffFourierPhase->SetMarkerStyle(fData[0].diffFourierPhase->GetMarkerStyle());
} }
if (fDataAvg.diffFourierPhaseOptReal != nullptr) { if (fDataAvg.diffFourierPhaseOptReal != nullptr) {
for (Int_t i=0; i<fData[0].diffFourierPhaseOptReal->GetNbinsX(); i++) { for (Int_t i=0; i<fData[0].diffFourierPhaseOptReal->GetNbinsX(); i++) {