Skip to content

Commit 9007f34

Browse files
vkuceravkucera
committed
Modernise macros
1 parent 320d443 commit 9007f34

File tree

7 files changed

+102
-137
lines changed

7 files changed

+102
-137
lines changed

‎PWGHF/D2H/Macros/HFInvMassFitter.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class HFInvMassFitter : public TNamed
9999
mParamSgn = sigmaLimit;
100100
}
101101
void setParticlePdgMass(Double_t mass) { mMassParticle = mass; }
102-
Double_t getParticlePdgMass() const { return mMassParticle; }
102+
[[nodiscard]] Double_t getParticlePdgMass() const { return mMassParticle; }
103103
void setInitialGaussianMean(Double_t mean)
104104
{
105105
mMass = mean;

‎PWGHF/HFC/Macros/DhCorrelationExtraction.cxx‎

Lines changed: 42 additions & 43 deletions
Large diffs are not rendered by default.

‎PWGHF/HFC/Macros/DhCorrelationExtraction.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class DhCorrelationExtraction : public TObject
4848

4949
DhCorrelationExtraction(); // default constructor
5050
DhCorrelationExtraction(const DhCorrelationExtraction& source);
51-
virtual ~DhCorrelationExtraction();
51+
~DhCorrelationExtraction() override;
5252

5353
/// Methods to set the input configuration
5454
// Input files, directories and histograms

‎PWGHF/HFC/Macros/DhCorrelationFitter.cxx‎

Lines changed: 34 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,24 @@ DhCorrelationFitter::DhCorrelationFitter() : // default constructor
4747
fMinAssoPt(0.),
4848
fMaxAssoPt(99.),
4949
fNpars(0),
50-
fExtParsVals(0x0),
51-
fExtParsLowBounds(0x0),
52-
fExtParsUppBounds(0x0),
50+
fExtParsVals(nullptr),
51+
fExtParsLowBounds(nullptr),
52+
fExtParsUppBounds(nullptr),
5353
fUseExternalPars(kFALSE),
5454
fShiftBaselineUp(kFALSE),
5555
fShiftBaselineDown(kFALSE),
5656
fIsTotal(kTRUE),
5757
fNbasleinePoints(0),
58-
fBinsBaseline(0x0),
59-
fHist(0x0),
58+
fBinsBaseline(nullptr),
59+
fHist(nullptr),
6060
fMinCorr(0),
6161
fMaxCorr(0),
6262
fBaseline(0.),
6363
fErrBaseline(0.),
64-
fFit(0x0),
65-
fGausNS(0x0),
66-
fGausAS(0x0),
67-
fPed(0x0),
64+
fFit(nullptr),
65+
fGausNS(nullptr),
66+
fGausAS(nullptr),
67+
fPed(nullptr),
6868
fv2AssocPart(0.),
6969
fv2Dmeson(0.),
7070
fNSyieldBinCount(0.),
@@ -84,25 +84,25 @@ DhCorrelationFitter::DhCorrelationFitter(TH1F* histoToFit, Double_t min, Double_
8484
fMinAssoPt(0.),
8585
fMaxAssoPt(99.),
8686
fNpars(0),
87-
fExtParsVals(0x0),
88-
fExtParsLowBounds(0x0),
89-
fExtParsUppBounds(0x0),
87+
fExtParsVals(nullptr),
88+
fExtParsLowBounds(nullptr),
89+
fExtParsUppBounds(nullptr),
9090
fUseExternalPars(kFALSE),
9191
fShiftBaselineUp(kFALSE),
9292
fShiftBaselineDown(kFALSE),
9393
fIsTotal(kTRUE),
9494
fNbasleinePoints(0),
95-
fBinsBaseline(0x0),
96-
fHist(0x0),
95+
fBinsBaseline(nullptr),
96+
fHist(nullptr),
9797
fMinCorr(0.),
9898
fMaxCorr(0.),
9999
fBaseline(0.),
100100
fErrBaseline(0.),
101-
fFit(0x0),
102-
fGausNS(0x0),
103-
fGausAS(0x0),
104-
fPed(0x0),
105-
fBaseTransvReg(0x0),
101+
fFit(nullptr),
102+
fGausNS(nullptr),
103+
fGausAS(nullptr),
104+
fPed(nullptr),
105+
fBaseTransvReg(nullptr),
106106
fv2AssocPart(0.),
107107
fv2Dmeson(0.),
108108
fNSyieldBinCount(0.),
@@ -115,43 +115,9 @@ DhCorrelationFitter::DhCorrelationFitter(TH1F* histoToFit, Double_t min, Double_
115115
fMaxCorr = max;
116116
}
117117

118-
DhCorrelationFitter::DhCorrelationFitter(const DhCorrelationFitter& source) : // copy constructor
119-
fIsReflected(source.fIsReflected),
120-
fTypeOfFitFunc(source.fTypeOfFitFunc),
121-
fFixBase(source.fFixBase),
122-
fFixMean(source.fFixMean),
123-
fMinCandPt(source.fMinCandPt),
124-
fMaxCandPt(source.fMaxCandPt),
125-
fMinAssoPt(source.fMinAssoPt),
126-
fMaxAssoPt(source.fMaxAssoPt),
127-
fNpars(source.fNpars),
128-
fExtParsVals(source.fExtParsVals),
129-
fExtParsLowBounds(source.fExtParsLowBounds),
130-
fExtParsUppBounds(source.fExtParsUppBounds),
131-
fUseExternalPars(source.fUseExternalPars),
132-
fShiftBaselineUp(source.fShiftBaselineUp),
133-
fShiftBaselineDown(source.fShiftBaselineDown),
134-
fIsTotal(source.fIsTotal),
135-
fNbasleinePoints(source.fNbasleinePoints),
136-
fBinsBaseline(source.fBinsBaseline),
137-
fHist(source.fHist),
138-
fMinCorr(source.fMinCorr),
139-
fMaxCorr(source.fMaxCorr),
140-
fBaseline(source.fBaseline),
141-
fErrBaseline(source.fErrBaseline),
142-
fFit(source.fFit),
143-
fGausNS(source.fGausNS),
144-
fGausAS(source.fGausAS),
145-
fPed(source.fPed),
146-
fBaseTransvReg(source.fBaseTransvReg),
147-
fv2AssocPart(source.fv2AssocPart),
148-
fv2Dmeson(source.fv2Dmeson),
149-
fNSyieldBinCount(source.fNSyieldBinCount),
150-
fErrNSyieldBinCount(source.fErrNSyieldBinCount),
151-
fASyieldBinCount(source.fASyieldBinCount),
152-
fErrASyieldBinCount(source.fErrASyieldBinCount)
153-
{
154-
}
118+
DhCorrelationFitter::DhCorrelationFitter(const DhCorrelationFitter& source)
119+
120+
= default;
155121

156122
DhCorrelationFitter::~DhCorrelationFitter()
157123
// destructor
@@ -160,20 +126,20 @@ DhCorrelationFitter::~DhCorrelationFitter()
160126

161127
if (fHist != nullptr) {
162128
delete fHist;
163-
fHist = 0;
129+
fHist = nullptr;
164130
}
165131
if (fFit != nullptr) {
166132
delete fFit;
167-
fFit = 0;
133+
fFit = nullptr;
168134
}
169135
if (fGausNS != nullptr) {
170136
delete fGausNS;
171-
fGausNS = 0;
137+
fGausNS = nullptr;
172138
}
173139
// if (fGausNS2) {delete fGausNS2; fGausNS2 = 0;}
174140
if (fPed != nullptr) {
175141
delete fPed;
176-
fPed = 0;
142+
fPed = nullptr;
177143
}
178144
}
179145

@@ -649,8 +615,8 @@ Double_t DhCorrelationFitter::findBaseline()
649615
// fix the baseline to the weighted average of the abs(fFixBaseline) lower points
650616
if (fFixBase < 0) {
651617
Int_t npointsAv = TMath::Abs(fFixBase);
652-
Int_t* ind = new Int_t[fHist->GetNbinsX()];
653-
Float_t* hval = new Float_t[fHist->GetNbinsX()];
618+
auto* ind = new Int_t[fHist->GetNbinsX()];
619+
auto* hval = new Float_t[fHist->GetNbinsX()];
654620
for (Int_t k = 1; k <= fHist->GetNbinsX(); k++) {
655621
hval[k - 1] = fHist->GetBinContent(k);
656622
}
@@ -955,7 +921,7 @@ Double_t DhCorrelationFitter::calculateBaselineError(TH1F*& histo, Bool_t totalR
955921

956922
void DhCorrelationFitter::setSingleTermsForDrawing(Bool_t draw)
957923
{
958-
Double_t* par = 0;
924+
Double_t* par = nullptr;
959925
if (fTypeOfFitFunc == 1 || fTypeOfFitFunc == 2 || fTypeOfFitFunc == 5) {
960926
par = new Double_t[7];
961927
} else if (fTypeOfFitFunc == 3 || fTypeOfFitFunc == 6) {
@@ -986,7 +952,7 @@ void DhCorrelationFitter::setSingleTermsForDrawing(Bool_t draw)
986952
fGausAS->SetLineColor(kGreen);
987953
fGausAS->SetLineWidth(4);
988954

989-
TPaveText* pvStatTests1 = new TPaveText(0.51, 0.58, 0.85, 0.90, "NDC");
955+
auto* pvStatTests1 = new TPaveText(0.51, 0.58, 0.85, 0.90, "NDC");
990956
pvStatTests1->SetFillStyle(0);
991957
pvStatTests1->SetTextSize(0.045);
992958
pvStatTests1->SetBorderSize(0);
@@ -1026,7 +992,7 @@ void DhCorrelationFitter::setSingleTermsForDrawing(Bool_t draw)
1026992
fGausNS->SetLineWidth(4);
1027993
fGausAS->SetLineWidth(4);
1028994

1029-
TPaveText* pvStatTests1 = new TPaveText(0.51, 0.58, 0.85, 0.90, "NDC");
995+
auto* pvStatTests1 = new TPaveText(0.51, 0.58, 0.85, 0.90, "NDC");
1030996
pvStatTests1->SetFillStyle(0);
1031997
pvStatTests1->SetTextSize(0.045);
1032998
pvStatTests1->SetBorderSize(0);
@@ -1076,7 +1042,7 @@ void DhCorrelationFitter::setSingleTermsForDrawing(Bool_t draw)
10761042
fGausNS->SetLineWidth(4);
10771043
fGausAS->SetLineWidth(4);
10781044

1079-
TPaveText* pvStatTests1 = new TPaveText(0.51, 0.58, 0.85, 0.90, "NDC");
1045+
auto* pvStatTests1 = new TPaveText(0.51, 0.58, 0.85, 0.90, "NDC");
10801046
pvStatTests1->SetFillStyle(0);
10811047
pvStatTests1->SetTextSize(0.045);
10821048
pvStatTests1->SetBorderSize(0);
@@ -1088,7 +1054,7 @@ void DhCorrelationFitter::setSingleTermsForDrawing(Bool_t draw)
10881054
t5 = pvStatTests1->AddText(0., 0.35, Form("AS #sigma = %.3f#pm%.3f ", fFit->GetParameter("AS #sigma"), fFit->GetParError(fFit->GetParNumber("AS #sigma"))));
10891055
// t6 = pvStatTests1 -> AddText(0., 0.20, Form("#beta = %.3f#pm%.3f ", fFit -> GetParameter("NS shape par"), fFit -> GetParError(fFit->GetParNumber("NS shape par"))));
10901056

1091-
TPaveText* pvStatTests2 = new TPaveText(0.51, 0.28, 0.85, 0.60, "NDC");
1057+
auto* pvStatTests2 = new TPaveText(0.51, 0.28, 0.85, 0.60, "NDC");
10921058
pvStatTests2->SetFillStyle(0);
10931059
pvStatTests2->SetTextSize(0.045);
10941060
pvStatTests2->SetBorderSize(0);
@@ -1128,7 +1094,7 @@ void DhCorrelationFitter::setSingleTermsForDrawing(Bool_t draw)
11281094
fGausNS->SetLineWidth(4);
11291095
fGausAS->SetLineWidth(4);
11301096

1131-
TPaveText* pvStatTests1 = new TPaveText(0.51, 0.58, 0.85, 0.90, "NDC");
1097+
auto* pvStatTests1 = new TPaveText(0.51, 0.58, 0.85, 0.90, "NDC");
11321098
pvStatTests1->SetFillStyle(0);
11331099
pvStatTests1->SetTextSize(0.045);
11341100
pvStatTests1->SetBorderSize(0);

‎PWGHF/HFC/Macros/DhCorrelationFitter.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,26 +85,26 @@ class DhCorrelationFitter
8585
Double_t getNsYield() { return fFit->GetParameter("NS Y"); }
8686
Double_t getAsYield() { return fFit->GetParameter("AS Y"); }
8787
Double_t getBeta() { return fFit->GetParameter(7); }
88-
Double_t getPedestal() const { return fBaseline; }
88+
[[nodiscard]] Double_t getPedestal() const { return fBaseline; }
8989
Double_t getv2hadron() { return fFit->GetParameter("v_{2} hadron"); }
9090
Double_t getv2Dmeson() { return fFit->GetParameter("v_{2} D meson"); }
9191
Double_t getNsSigmaError() { return fFit->GetParError(fFit->GetParNumber("NS #sigma")); } // TODO: case kConstThreeGausPeriodicity
9292
Double_t getAsSigmaError() { return fFit->GetParError(fFit->GetParNumber("AS #sigma")); } // TODO: case kConstThreeGausPeriodicityAS
9393
Double_t getNsYieldError() { return fFit->GetParError(fFit->GetParNumber("NS Y")); }
9494
Double_t getAsYieldError() { return fFit->GetParError(fFit->GetParNumber("AS Y")); }
9595
Double_t getBetaError() { return fFit->GetParError(7); }
96-
Double_t getPedestalError() const { return fErrBaseline; }
96+
[[nodiscard]] Double_t getPedestalError() const { return fErrBaseline; }
9797
Double_t getv2hadronError() { return fFit->GetParError(fFit->GetParNumber("v_{2} hadron")); }
9898
Double_t getv2DmesonError() { return fFit->GetParError(fFit->GetParNumber("v_{2} D meson")); }
99-
Double_t getBinCountingNsYield() const { return fNSyieldBinCount; }
100-
Double_t getBinCountingAsYield() const { return fASyieldBinCount; }
101-
Double_t getBinCountingNsYieldErr() const { return fErrNSyieldBinCount; }
102-
Double_t getBinCountingAsYieldErr() const { return fErrASyieldBinCount; }
99+
[[nodiscard]] Double_t getBinCountingNsYield() const { return fNSyieldBinCount; }
100+
[[nodiscard]] Double_t getBinCountingAsYield() const { return fASyieldBinCount; }
101+
[[nodiscard]] Double_t getBinCountingNsYieldErr() const { return fErrNSyieldBinCount; }
102+
[[nodiscard]] Double_t getBinCountingAsYieldErr() const { return fErrASyieldBinCount; }
103103
TF1* getFitFunction()
104104
{
105105
if (fFit == nullptr) {
106106
printf("[ERROR] DhCorrelationFitter::GetFitFunction, No fit function");
107-
return NULL;
107+
return nullptr;
108108
}
109109
return fFit;
110110
}

‎PWGHF/HFC/Macros/ExtractOutputCorrel.C‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void extractOutputCorrelDs(const TString cfgFileName = "config_CorrAnalysis.json
166166
TH1D* hCorrectedCorrelReflectedBaselineSubtr[nBinsPtCand][nBinsPtHad];
167167

168168
// Create and set the correlation plotter class
169-
DhCorrelationExtraction* plotter = new DhCorrelationExtraction();
169+
auto* plotter = new DhCorrelationExtraction();
170170

171171
Bool_t flagSpecie = plotter->setDmesonSpecie(static_cast<DhCorrelationExtraction::DmesonSpecie>(specie));
172172
plotter->setNpools(npools);
@@ -232,7 +232,7 @@ void extractOutputCorrelDs(const TString cfgFileName = "config_CorrAnalysis.json
232232
}
233233

234234
// output file
235-
TFile* outFile = new TFile(Form("Output_CorrelationExtraction_%s_Root/ExtractCorrelationsResults.root", codeNameAnalysis.data()), "RECREATE");
235+
auto* outFile = new TFile(Form("Output_CorrelationExtraction_%s_Root/ExtractCorrelationsResults.root", codeNameAnalysis.data()), "RECREATE");
236236
outFile->cd();
237237
for (int iBinPtCand = 0; iBinPtCand < nBinsPtCand; iBinPtCand++) {
238238
for (int iBinPtHad = 0; iBinPtHad < nBinsPtHad; iBinPtHad++) {
@@ -242,7 +242,7 @@ void extractOutputCorrelDs(const TString cfgFileName = "config_CorrAnalysis.json
242242
outFile->Close();
243243

244244
// output file baseline subtr.
245-
TFile* outFileBaselineSubtr = new TFile(Form("Output_CorrelationExtraction_%s_Root/ExtractCorrelationsResults_BaselineSubtr.root", codeNameAnalysis.data()), "RECREATE");
245+
auto* outFileBaselineSubtr = new TFile(Form("Output_CorrelationExtraction_%s_Root/ExtractCorrelationsResults_BaselineSubtr.root", codeNameAnalysis.data()), "RECREATE");
246246
outFileBaselineSubtr->cd();
247247
for (int iBinPtCand = 0; iBinPtCand < nBinsPtCand; iBinPtCand++) {
248248
for (int iBinPtHad = 0; iBinPtHad < nBinsPtHad; iBinPtHad++) {
@@ -252,7 +252,7 @@ void extractOutputCorrelDs(const TString cfgFileName = "config_CorrAnalysis.json
252252
outFileBaselineSubtr->Close();
253253

254254
// output file reflected
255-
TFile* outFileReflected = new TFile(Form("Output_CorrelationExtraction_%s_Root/ExtractCorrelationsResults_Reflected.root", codeNameAnalysis.data()), "RECREATE");
255+
auto* outFileReflected = new TFile(Form("Output_CorrelationExtraction_%s_Root/ExtractCorrelationsResults_Reflected.root", codeNameAnalysis.data()), "RECREATE");
256256
outFileReflected->cd();
257257
for (int iBinPtCand = 0; iBinPtCand < nBinsPtCand; iBinPtCand++) {
258258
for (int iBinPtHad = 0; iBinPtHad < nBinsPtHad; iBinPtHad++) {
@@ -262,7 +262,7 @@ void extractOutputCorrelDs(const TString cfgFileName = "config_CorrAnalysis.json
262262
outFileReflected->Close();
263263

264264
// output file reflected baseline subtr.
265-
TFile* outFileReflectedBaselineSubtr = new TFile(Form("Output_CorrelationExtraction_%s_Root/ExtractCorrelationsResults_Reflected_BaselineSubtr.root", codeNameAnalysis.data()), "RECREATE");
265+
auto* outFileReflectedBaselineSubtr = new TFile(Form("Output_CorrelationExtraction_%s_Root/ExtractCorrelationsResults_Reflected_BaselineSubtr.root", codeNameAnalysis.data()), "RECREATE");
266266
outFileReflectedBaselineSubtr->cd();
267267
for (int iBinPtCand = 0; iBinPtCand < nBinsPtCand; iBinPtCand++) {
268268
for (int iBinPtHad = 0; iBinPtHad < nBinsPtHad; iBinPtHad++) {

0 commit comments

Comments
 (0)