Skip to content

Commit f61f7be

Browse files
pstahlhupstahlhu
committed
Unify histogram order and fix if condition for plot labels
1 parent e0cd945 commit f61f7be

File tree

2 files changed

+23
-35
lines changed

2 files changed

+23
-35
lines changed

‎PWGHF/D2H/Macros/HFInvMassFitter.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -584,11 +584,11 @@ void HFInvMassFitter::drawFit(TVirtualPad* pad, const std::vector<std::string>&
584584
textFitMetrics->AddText(Form("B (%d#sigma) = %.0f #pm %.0f", mNSigmaForSidebands, mBkgYield, mBkgYieldErr));
585585
textFitMetrics->AddText(Form("S/B (%d#sigma) = %.4g ", mNSigmaForSidebands, mRawYield / mBkgYield));
586586
textFitMetrics->AddText(Form("Significance (%d#sigma) = %.1f #pm %.1f ", mNSigmaForSidebands, mSignificance, mSignificanceErr));
587-
if (mReflPdf != nullptr) {
588-
textFitMetrics->AddText(Form("Refl/Sig = %.3f #pm %.3f ", mReflOverSgn, 0.0));
589-
}
590587
textFitMetrics->AddText(Form("#chi^{2} / ndf = %.3f", mChiSquareOverNdfTotal));
591588
}
589+
if (mReflPdf != nullptr) {
590+
textFitMetrics->AddText(Form("Refl/Sig = %.3f #pm %.3f ", mReflOverSgn, 0.0));
591+
}
592592
mInvMassFrame->addObject(textFitMetrics);
593593
// Analysis information
594594
auto* textAnalysisInfo = new TPaveText(0.18, 0.78, 0.35, 0.88, "NDC");

‎PWGHF/D2H/Macros/runMassFitter.C‎

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@ int runMassFitter(const TString& configFileName)
9191

9292
Bool_t const isMc = config["IsMC"].GetBool();
9393
Bool_t const writeSignalPar = config["WriteSignalPar"].GetBool();
94+
TString const particleName = config["Particle"].GetString();
95+
TString const collisionSystem = config["CollisionSystem"].GetString();
9496
TString const inputFileName = config["InFileName"].GetString();
9597
TString const reflFileName = config["ReflFileName"].GetString();
9698
TString outputFileName = config["OutFileName"].GetString();
97-
TString const particleName = config["Particle"].GetString();
98-
TString const collisionSystem = config["CollisionSystem"].GetString();
9999

100100
std::vector<std::string> inputHistoName;
101101
std::vector<std::string> promptHistoName;
@@ -275,30 +275,18 @@ int runMassFitter(const TString& configFileName)
275275
inputFile->Close();
276276

277277
// define output histos
278-
auto* hRawYieldsSignal = new TH1D("hRawYieldsSignal",
279-
";" + sliceVarName + "(" + sliceVarUnit + ");raw yield", nSliceVarBins, sliceVarLimits.data());
280-
auto* hRawYieldsSignalCounted = new TH1D("hRawYieldsSignalCounted",
281-
";" + sliceVarName + "(" + sliceVarUnit + ");raw yield via bin count", nSliceVarBins, sliceVarLimits.data());
282-
auto* hRawYieldsMean = new TH1D("hRawYieldsMean",
283-
";" + sliceVarName + "(" + sliceVarUnit + ");mean (GeV/#it{c}^{2})", nSliceVarBins, sliceVarLimits.data());
284-
auto* hRawYieldsSigma = new TH1D("hRawYieldsSigma",
285-
";" + sliceVarName + "(" + sliceVarUnit + ");width (GeV/#it{c}^{2})", nSliceVarBins, sliceVarLimits.data());
286-
auto* hRawYieldsSecSigma = new TH1D("hRawYieldsSecSigma",
287-
";" + sliceVarName + "(" + sliceVarUnit + ");width (GeV/#it{c}^{2})", nSliceVarBins, sliceVarLimits.data());
288-
auto* hRawYieldsFracDoubleGaus = new TH1D("hRawYieldsFracDoubleGaus",
289-
";" + sliceVarName + "(" + sliceVarUnit + ");fraction of double gaussian", nSliceVarBins, sliceVarLimits.data());
290-
auto* hRawYieldsSignificance = new TH1D("hRawYieldsSignificance",
291-
";" + sliceVarName + "(" + sliceVarUnit + ");significance (3#sigma)", nSliceVarBins, sliceVarLimits.data());
292-
auto* hRawYieldsSgnOverBkg = new TH1D("hRawYieldsSgnOverBkg",
293-
";" + sliceVarName + "(" + sliceVarUnit + ");S/B (3#sigma)", nSliceVarBins, sliceVarLimits.data());
294-
auto* hRawYieldsBkg = new TH1D("hRawYieldsBkg",
295-
";" + sliceVarName + "(" + sliceVarUnit + ");Background (3#sigma)", nSliceVarBins, sliceVarLimits.data());
296-
auto* hRawYieldsChiSquareBkg = new TH1D("hRawYieldsChiSquareBkg",
297-
";" + sliceVarName + "(" + sliceVarUnit + ");#chi^{2}/#it{ndf}", nSliceVarBins, sliceVarLimits.data());
298-
auto* hRawYieldsChiSquareTotal = new TH1D("hRawYieldsChiSquareTotal",
299-
";" + sliceVarName + "(" + sliceVarUnit + ");#chi^{2}/#it{ndf}", nSliceVarBins, sliceVarLimits.data());
300-
auto* hReflectionOverSignal = new TH1D("hReflectionOverSignal",
301-
";" + sliceVarName + "(" + sliceVarUnit + ");Refl/Signal", nSliceVarBins, sliceVarLimits.data());
278+
auto* hRawYieldsSignal = new TH1D("hRawYieldsSignal", ";" + sliceVarName + "(" + sliceVarUnit + ");raw yield", nSliceVarBins, sliceVarLimits.data());
279+
auto* hRawYieldsSignalCounted = new TH1D("hRawYieldsSignalCounted", ";" + sliceVarName + "(" + sliceVarUnit + ");raw yield via bin count", nSliceVarBins, sliceVarLimits.data());
280+
auto* hRawYieldsBkg = new TH1D("hRawYieldsBkg", ";" + sliceVarName + "(" + sliceVarUnit + ");Background (3#sigma)", nSliceVarBins, sliceVarLimits.data());
281+
auto* hRawYieldsSgnOverBkg = new TH1D("hRawYieldsSgnOverBkg", ";" + sliceVarName + "(" + sliceVarUnit + ");S/B (3#sigma)", nSliceVarBins, sliceVarLimits.data());
282+
auto* hRawYieldsSignificance = new TH1D("hRawYieldsSignificance", ";" + sliceVarName + "(" + sliceVarUnit + ");significance (3#sigma)", nSliceVarBins, sliceVarLimits.data());
283+
auto* hRawYieldsChiSquareBkg = new TH1D("hRawYieldsChiSquareBkg", ";" + sliceVarName + "(" + sliceVarUnit + ");#chi^{2}/#it{ndf}", nSliceVarBins, sliceVarLimits.data());
284+
auto* hRawYieldsChiSquareTotal = new TH1D("hRawYieldsChiSquareTotal", ";" + sliceVarName + "(" + sliceVarUnit + ");#chi^{2}/#it{ndf}", nSliceVarBins, sliceVarLimits.data());
285+
auto* hReflectionOverSignal = new TH1D("hReflectionOverSignal", ";" + sliceVarName + "(" + sliceVarUnit + ");Refl/Signal", nSliceVarBins, sliceVarLimits.data());
286+
auto* hRawYieldsMean = new TH1D("hRawYieldsMean", ";" + sliceVarName + "(" + sliceVarUnit + ");mean (GeV/#it{c}^{2})", nSliceVarBins, sliceVarLimits.data());
287+
auto* hRawYieldsSigma = new TH1D("hRawYieldsSigma", ";" + sliceVarName + "(" + sliceVarUnit + ");width (GeV/#it{c}^{2})", nSliceVarBins, sliceVarLimits.data());
288+
auto* hRawYieldsSecSigma = new TH1D("hRawYieldsSecSigma", ";" + sliceVarName + "(" + sliceVarUnit + ");width (GeV/#it{c}^{2})", nSliceVarBins, sliceVarLimits.data());
289+
auto* hRawYieldsFracDoubleGaus = new TH1D("hRawYieldsFracDoubleGaus", ";" + sliceVarName + "(" + sliceVarUnit + ");fraction of double gaussian", nSliceVarBins, sliceVarLimits.data());
302290

303291
const Int_t nConfigsToSave = 6;
304292
auto* hFitConfig = new TH2F("hfitConfig", "Fit Configurations", nConfigsToSave, 0, 6, nSliceVarBins, sliceVarLimits.data());
@@ -313,16 +301,16 @@ int runMassFitter(const TString& configFileName)
313301

314302
setHistoStyle(hRawYieldsSignal);
315303
setHistoStyle(hRawYieldsSignalCounted);
316-
setHistoStyle(hRawYieldsMean);
317-
setHistoStyle(hRawYieldsSigma);
318-
setHistoStyle(hRawYieldsSecSigma);
319-
setHistoStyle(hRawYieldsFracDoubleGaus);
320-
setHistoStyle(hRawYieldsSignificance);
321-
setHistoStyle(hRawYieldsSgnOverBkg);
322304
setHistoStyle(hRawYieldsBkg);
305+
setHistoStyle(hRawYieldsSgnOverBkg);
306+
setHistoStyle(hRawYieldsSignificance);
323307
setHistoStyle(hRawYieldsChiSquareBkg);
324308
setHistoStyle(hRawYieldsChiSquareTotal);
325309
setHistoStyle(hReflectionOverSignal, kRed + 1);
310+
setHistoStyle(hRawYieldsMean);
311+
setHistoStyle(hRawYieldsSigma);
312+
setHistoStyle(hRawYieldsSecSigma);
313+
setHistoStyle(hRawYieldsFracDoubleGaus);
326314

327315
auto getHistToFix = [&nSliceVarBins](bool const& isFix, std::vector<double> const& fixManual, std::string const& fixFileName, std::string const& var) -> TH1* {
328316
TH1* histToFix = nullptr;

0 commit comments

Comments
 (0)