Skip to content

Commit e0cd945

Browse files
pstahlhupstahlhu
committed
Comply with Vit's clang-tidy fixes
1 parent 02f1bba commit e0cd945

File tree

3 files changed

+40
-49
lines changed

3 files changed

+40
-49
lines changed

‎PWGHF/D2H/Macros/HFInvMassFitter.cxx‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/// \author Xinye Peng <xinye.peng@cern.ch>
1818
/// \author Biao Zhang <biao.zhang@cern.ch>
1919
/// \author Oleksii Lubynets <oleksii.lubynets@cern.ch>
20+
/// \author Phil Stahlhut <phil.lennart.stahlhut@cern.ch>
2021

2122
#include "HFInvMassFitter.h"
2223

@@ -572,7 +573,7 @@ void HFInvMassFitter::drawFit(TVirtualPad* pad, const std::vector<std::string>&
572573
gStyle->SetFrameFillColor(0);
573574
pad->cd();
574575
// Fit metrics
575-
TPaveText* textFitMetrics = new TPaveText(0.65, 0.7, 0.9, 0.88, "NDC");
576+
auto* textFitMetrics = new TPaveText(0.65, 0.7, 0.9, 0.88, "NDC");
576577
textFitMetrics->SetBorderSize(0);
577578
textFitMetrics->SetFillStyle(0);
578579
textFitMetrics->SetTextSize(0.04);
@@ -582,17 +583,15 @@ void HFInvMassFitter::drawFit(TVirtualPad* pad, const std::vector<std::string>&
582583
if (mTypeOfBkgPdf != NoBkg) {
583584
textFitMetrics->AddText(Form("B (%d#sigma) = %.0f #pm %.0f", mNSigmaForSidebands, mBkgYield, mBkgYieldErr));
584585
textFitMetrics->AddText(Form("S/B (%d#sigma) = %.4g ", mNSigmaForSidebands, mRawYield / mBkgYield));
585-
}
586-
if (mReflPdf) {
587-
textFitMetrics->AddText(Form("Refl/Sig = %.3f #pm %.3f ", mReflOverSgn, 0.0));
588-
}
589-
if (mTypeOfBkgPdf != NoBkg) {
590586
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+
}
591590
textFitMetrics->AddText(Form("#chi^{2} / ndf = %.3f", mChiSquareOverNdfTotal));
592591
}
593592
mInvMassFrame->addObject(textFitMetrics);
594593
// Analysis information
595-
TPaveText* textAnalysisInfo = new TPaveText(0.18, 0.78, 0.35, 0.88, "NDC");
594+
auto* textAnalysisInfo = new TPaveText(0.18, 0.78, 0.35, 0.88, "NDC");
596595
textAnalysisInfo->SetBorderSize(0);
597596
textAnalysisInfo->SetFillStyle(0);
598597
textAnalysisInfo->SetTextSize(0.05);
@@ -603,7 +602,7 @@ void HFInvMassFitter::drawFit(TVirtualPad* pad, const std::vector<std::string>&
603602
mInvMassFrame->addObject(textAnalysisInfo);
604603
if (writeParInfo) {
605604
// right text box
606-
TPaveText* textSignalPar = new TPaveText(0.18, 0.65, 0.4, 0.75, "NDC");
605+
auto* textSignalPar = new TPaveText(0.18, 0.65, 0.4, 0.75, "NDC");
607606
textSignalPar->SetBorderSize(0);
608607
textSignalPar->SetFillStyle(0);
609608
textSignalPar->SetTextColor(kBlue);
@@ -675,7 +674,7 @@ void HFInvMassFitter::drawRatio(TVirtualPad* pad)
675674
mRatioFrame->GetYaxis()->SetTitle("Fit / Data");
676675
double xMin = mRatioFrame->GetXaxis()->GetXmin();
677676
double xMax = mRatioFrame->GetXaxis()->GetXmax();
678-
TLine* line = new TLine(xMin, 1.0, xMax, 1.0);
677+
auto* line = new TLine(xMin, 1.0, xMax, 1.0);
679678
line->SetLineColor(kGray);
680679
line->SetLineStyle(2);
681680
line->SetLineWidth(2);

‎PWGHF/D2H/Macros/HFInvMassFitter.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/// \author Xinye Peng <xinye.peng@cern.ch>
1818
/// \author Biao Zhang <biao.zhang@cern.ch>
1919
/// \author Oleksii Lubynets <oleksii.lubynets@cern.ch>
20+
/// \author Phil Stahlhut <phil.lennart.stahlhut@cern.ch>
2021

2122
#ifndef PWGHF_D2H_MACROS_HFINVMASSFITTER_H_
2223
#define PWGHF_D2H_MACROS_HFINVMASSFITTER_H_

‎PWGHF/D2H/Macros/runMassFitter.C‎

Lines changed: 31 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/// \author Xinye Peng <xinye.peng@cern.ch>
1818
/// \author Biao Zhang <biao.zhang@cern.ch>
1919
/// \author Oleksii Lubynets <oleksii.lubynets@cern.ch>
20+
/// \author Phil Stahlhut <phil.lennart.stahlhut@cern.ch>
2021

2122
#if !defined(__CINT__) || defined(__CLING__)
2223

@@ -88,13 +89,13 @@ int runMassFitter(const TString& configFileName)
8889
config.ParseStream(is);
8990
fclose(configFile);
9091

91-
Bool_t isMc = config["IsMC"].GetBool();
92-
Bool_t writeSignalPar = config["WriteSignalPar"].GetBool();
93-
TString inputFileName = config["InFileName"].GetString();
94-
TString reflFileName = config["ReflFileName"].GetString();
92+
Bool_t const isMc = config["IsMC"].GetBool();
93+
Bool_t const writeSignalPar = config["WriteSignalPar"].GetBool();
94+
TString const inputFileName = config["InFileName"].GetString();
95+
TString const reflFileName = config["ReflFileName"].GetString();
9596
TString outputFileName = config["OutFileName"].GetString();
96-
TString particleName = config["Particle"].GetString();
97-
TString collisionSystem = config["CollisionSystem"].GetString();
97+
TString const particleName = config["Particle"].GetString();
98+
TString const collisionSystem = config["CollisionSystem"].GetString();
9899

99100
std::vector<std::string> inputHistoName;
100101
std::vector<std::string> promptHistoName;
@@ -274,40 +275,30 @@ int runMassFitter(const TString& configFileName)
274275
inputFile->Close();
275276

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

312303
const Int_t nConfigsToSave = 6;
313304
auto* hFitConfig = new TH2F("hfitConfig", "Fit Configurations", nConfigsToSave, 0, 6, nSliceVarBins, sliceVarLimits.data());

0 commit comments

Comments
 (0)