Skip to content

Commit 17f1338

Browse files
lubynetslubynets
committed
do not use Root types: kFALSE & kTRUE
1 parent 94db11e commit 17f1338

File tree

3 files changed

+56
-56
lines changed

3 files changed

+56
-56
lines changed

‎PWGHF/D2H/Macros/HFInvMassFitter.cxx‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,21 @@ HFInvMassFitter::HFInvMassFitter() : mHistoInvMass(nullptr),
7575
mNSigmaForSgn(3.),
7676
mSigmaSgnErr(0.),
7777
mSigmaSgnDoubleGaus(0.025),
78-
mFixedMean(kFALSE),
79-
mBoundMean(kFALSE),
80-
mBoundReflMean(kFALSE),
81-
mFixedSigma(kFALSE),
82-
mFixedSigmaDoubleGaus(kFALSE),
83-
mBoundSigma(kFALSE),
78+
mFixedMean(false),
79+
mBoundMean(false),
80+
mBoundReflMean(false),
81+
mFixedSigma(false),
82+
mFixedSigmaDoubleGaus(false),
83+
mBoundSigma(false),
8484
mSigmaValue(0.012),
8585
mParamSgn(0.1),
8686
mFracDoubleGaus(0.2),
8787
mFixedRawYield(-1.),
88-
mFixedFracDoubleGaus(kFALSE),
88+
mFixedFracDoubleGaus(false),
8989
mRatioDoubleGausSigma(0.),
90-
mFixedRatioDoubleGausSigma(kFALSE),
90+
mFixedRatioDoubleGausSigma(false),
9191
mReflOverSgn(0),
92-
mEnableReflections(kFALSE),
92+
mEnableReflections(false),
9393
mRawYield(0),
9494
mRawYieldErr(0),
9595
mRawYieldCounted(0),
@@ -100,7 +100,7 @@ HFInvMassFitter::HFInvMassFitter() : mHistoInvMass(nullptr),
100100
mSignificanceErr(0),
101101
mChiSquareOverNdfTotal(0),
102102
mChiSquareOverNdfBkg(0),
103-
mFixReflOverSgn(kFALSE),
103+
mFixReflOverSgn(false),
104104
mRooMeanSgn(nullptr),
105105
mRooSigmaSgn(nullptr),
106106
mRooSecSigmaSgn(nullptr),
@@ -122,8 +122,8 @@ HFInvMassFitter::HFInvMassFitter() : mHistoInvMass(nullptr),
122122
mIntegralBkg(0),
123123
mIntegralSgn(0),
124124
mHistoTemplateRefl(nullptr),
125-
mDrawBgPrefit(kFALSE),
126-
mHighlightPeakRegion(kFALSE)
125+
mDrawBgPrefit(false),
126+
mHighlightPeakRegion(false)
127127
{
128128
// default constructor
129129
}
@@ -148,21 +148,21 @@ HFInvMassFitter::HFInvMassFitter(const TH1* histoToFit, double minValue, double
148148
mNSigmaForSgn(3.),
149149
mSigmaSgnErr(0.),
150150
mSigmaSgnDoubleGaus(0.025),
151-
mFixedMean(kFALSE),
152-
mBoundMean(kFALSE),
153-
mBoundReflMean(kFALSE),
154-
mFixedSigma(kFALSE),
155-
mFixedSigmaDoubleGaus(kFALSE),
156-
mBoundSigma(kFALSE),
151+
mFixedMean(false),
152+
mBoundMean(false),
153+
mBoundReflMean(false),
154+
mFixedSigma(false),
155+
mFixedSigmaDoubleGaus(false),
156+
mBoundSigma(false),
157157
mSigmaValue(0.012),
158158
mParamSgn(0.1),
159159
mFracDoubleGaus(0.2),
160160
mFixedRawYield(-1.),
161-
mFixedFracDoubleGaus(kFALSE),
161+
mFixedFracDoubleGaus(false),
162162
mRatioDoubleGausSigma(0.),
163-
mFixedRatioDoubleGausSigma(kFALSE),
163+
mFixedRatioDoubleGausSigma(false),
164164
mReflOverSgn(0),
165-
mEnableReflections(kFALSE),
165+
mEnableReflections(false),
166166
mRawYield(0),
167167
mRawYieldErr(0),
168168
mRawYieldCounted(0),
@@ -173,7 +173,7 @@ HFInvMassFitter::HFInvMassFitter(const TH1* histoToFit, double minValue, double
173173
mSignificanceErr(0),
174174
mChiSquareOverNdfTotal(0),
175175
mChiSquareOverNdfBkg(0),
176-
mFixReflOverSgn(kFALSE),
176+
mFixReflOverSgn(false),
177177
mRooMeanSgn(nullptr),
178178
mRooSigmaSgn(nullptr),
179179
mRooSecSigmaSgn(nullptr),
@@ -195,8 +195,8 @@ HFInvMassFitter::HFInvMassFitter(const TH1* histoToFit, double minValue, double
195195
mIntegralBkg(0),
196196
mIntegralSgn(0),
197197
mHistoTemplateRefl(nullptr),
198-
mDrawBgPrefit(kFALSE),
199-
mHighlightPeakRegion(kFALSE)
198+
mDrawBgPrefit(false),
199+
mHighlightPeakRegion(false)
200200
{
201201
// standard constructor
202202
mHistoInvMass = dynamic_cast<TH1*>(histoToFit->Clone(histoToFit->GetTitle()));
@@ -310,7 +310,7 @@ void HFInvMassFitter::doFit()
310310
mRooNSgn = new RooRealVar("mNSgn", "number of signal", 0.3 * estimatedSignal, 0., 1.2 * estimatedSignal); // estimated signal yield
311311
if (mFixedRawYield > 0) {
312312
mRooNSgn->setVal(mFixedRawYield); // fixed signal yield
313-
mRooNSgn->setConstant(kTRUE);
313+
mRooNSgn->setConstant(true);
314314
}
315315
mSgnPdf = new RooAddPdf("mSgnPdf", "signal fit function", RooArgList(*sgnPdf), RooArgList(*mRooNSgn));
316316
// create reflection template and fit to reflection
@@ -330,7 +330,7 @@ void HFInvMassFitter::doFit()
330330
reflFuncTemp.plotOn(mReflOnlyFrame);
331331

332332
mRooNRefl->setVal(mReflOverSgn * estimatedSignal);
333-
mRooNRefl->setConstant(kTRUE);
333+
mRooNRefl->setConstant(true);
334334
setReflFuncFixed(); // fix reflection pdf parameter
335335
mTotalPdf = new RooAddPdf("mTotalPdf", "background + signal + reflection fit function", RooArgList(*bkgPdf, *sgnPdf, *reflPdf), RooArgList(*mRooNBkg, *mRooNSgn, *mRooNRefl));
336336
if (strcmp(mFitOption.Data(), "Chi2") == 0) {
@@ -435,12 +435,12 @@ void HFInvMassFitter::fillWorkspace(RooWorkspace& workspace) const
435435
// signal Gaussian
436436
if (mFixedMean) {
437437
mean.setVal(mMass);
438-
mean.setConstant(kTRUE);
438+
mean.setConstant(true);
439439
}
440440
RooRealVar sigma("sigma", "sigma for signal", mSigmaSgn, mSigmaSgn - 0.01, mSigmaSgn + 0.01);
441441
if (mFixedSigma) {
442442
sigma.setVal(mSigmaSgn);
443-
sigma.setConstant(kTRUE);
443+
sigma.setConstant(true);
444444
}
445445
if (mBoundSigma) {
446446
sigma.setMax(mSigmaSgn * (1 + mParamSgn));
@@ -457,18 +457,18 @@ void HFInvMassFitter::fillWorkspace(RooWorkspace& workspace) const
457457
}
458458
if (mFixedSigma) {
459459
sigma.setVal(mSigmaSgn);
460-
sigma.setConstant(kTRUE);
460+
sigma.setConstant(true);
461461
}
462462
if (mFixedSigmaDoubleGaus) {
463463
sigmaDoubleGaus.setVal(mSigmaSgnDoubleGaus);
464-
sigmaDoubleGaus.setConstant(kTRUE);
464+
sigmaDoubleGaus.setConstant(true);
465465
}
466466
RooGaussian const gaus1("gaus1", "gaus1", mass, mean, sigma);
467467
RooGaussian const gaus2("gaus2", "gaus2", mass, mean, sigmaDoubleGaus);
468468
RooRealVar fracDoubleGaus("fracDoubleGaus", "frac of two gauss", mFracDoubleGaus, 0, 1.);
469469
if (mFixedFracDoubleGaus) {
470470
fracDoubleGaus.setVal(mFracDoubleGaus);
471-
fracDoubleGaus.setConstant(kTRUE);
471+
fracDoubleGaus.setConstant(true);
472472
}
473473
RooAbsPdf* sgnFuncDoubleGaus = new RooAddPdf("sgnFuncDoubleGaus", "signal pdf", RooArgList(gaus1, gaus2), fracDoubleGaus);
474474
workspace.import(*sgnFuncDoubleGaus);
@@ -477,11 +477,11 @@ void HFInvMassFitter::fillWorkspace(RooWorkspace& workspace) const
477477
RooRealVar ratio("ratio", "ratio of sigma12", mRatioDoubleGausSigma, 0, 10);
478478
if (mFixedSigma) {
479479
sigma.setVal(mSigmaSgn);
480-
sigma.setConstant(kTRUE);
480+
sigma.setConstant(true);
481481
}
482482
if (mFixedRatioDoubleGausSigma) {
483483
ratio.setVal(mRatioDoubleGausSigma);
484-
ratio.setConstant(kTRUE);
484+
ratio.setConstant(true);
485485
}
486486
if (mBoundSigma) {
487487
sigma.setMax(mSigmaSgn * (1 + mParamSgn));
@@ -493,7 +493,7 @@ void HFInvMassFitter::fillWorkspace(RooWorkspace& workspace) const
493493
RooRealVar fracDoubleGausRatio("fracDoubleGausRatio", "fraction of two gauss ratio", 0.5, 0, 1.);
494494
if (mFixedFracDoubleGaus) {
495495
fracDoubleGausRatio.setVal(mFracDoubleGaus);
496-
fracDoubleGausRatio.setConstant(kTRUE);
496+
fracDoubleGausRatio.setConstant(true);
497497
}
498498
RooAbsPdf* sgnFuncGausRatio = new RooAddPdf("sgnFuncGausRatio", "signal pdf", RooArgList(gausRatio1, gausRatio2), fracDoubleGausRatio);
499499
workspace.import(*sgnFuncGausRatio);
@@ -503,15 +503,15 @@ void HFInvMassFitter::fillWorkspace(RooWorkspace& workspace) const
503503
RooRealVar sigmaSec("sigmaSec", "sigmaSec", mSecSigma, mSecSigma - 0.005, mSecSigma + 0.01);
504504
if (mFixedMean) {
505505
meanSec.setVal(mSecMass);
506-
meanSec.setConstant(kTRUE);
506+
meanSec.setConstant(true);
507507
}
508508
if (mBoundMean) {
509509
meanSec.setMax(mMassUpLimit);
510510
meanSec.setMin(mMassLowLimit);
511511
}
512512
if (mFixedSigma) {
513513
sigmaSec.setVal(mSecSigma);
514-
sigmaSec.setConstant(kTRUE);
514+
sigmaSec.setConstant(true);
515515
}
516516
if (mBoundSigma) {
517517
sigmaSec.setMax(mSecSigma * (1 + mParamSgn));
@@ -894,33 +894,33 @@ void HFInvMassFitter::setReflFuncFixed()
894894
case SingleGausRefl: {
895895
RooRealVar* meanRefl = mWorkspace->var("meanRefl");
896896
RooRealVar* sigmaRefl = mWorkspace->var("sigmaRefl");
897-
meanRefl->setConstant(kTRUE);
898-
sigmaRefl->setConstant(kTRUE);
897+
meanRefl->setConstant(true);
898+
sigmaRefl->setConstant(true);
899899
} break;
900900
case DoubleGausRefl: {
901901
RooRealVar* meanRefl = mWorkspace->var("meanRefl");
902902
RooRealVar* sigmaRefl = mWorkspace->var("sigmaRefl");
903903
RooRealVar* meanReflDoubleGaus = mWorkspace->var("meanReflDoubleGaus");
904904
RooRealVar* sigmaReflDoubleGaus = mWorkspace->var("sigmaReflDoubleGaus");
905905
RooRealVar* fracRefl = mWorkspace->var("fracRefl");
906-
meanRefl->setConstant(kTRUE);
907-
sigmaRefl->setConstant(kTRUE);
908-
meanReflDoubleGaus->setConstant(kTRUE);
909-
sigmaReflDoubleGaus->setConstant(kTRUE);
910-
fracRefl->setConstant(kTRUE);
906+
meanRefl->setConstant(true);
907+
sigmaRefl->setConstant(true);
908+
meanReflDoubleGaus->setConstant(true);
909+
sigmaReflDoubleGaus->setConstant(true);
910+
fracRefl->setConstant(true);
911911
} break;
912912
case Poly3Refl: {
913913
std::array<RooRealVar*, 4> polyReflParam{nullptr};
914914
for (int iPar = 0; iPar < 4; ++iPar) {
915915
polyReflParam.at(iPar) = mWorkspace->var(Form("polyReflParam%d", iPar));
916-
polyReflParam.at(iPar)->setConstant(kTRUE);
916+
polyReflParam.at(iPar)->setConstant(true);
917917
}
918918
} break;
919919
case Poly6Refl: {
920920
std::array<RooRealVar*, 6> polyReflParam{nullptr};
921921
for (int iPar = 0; iPar < 6; ++iPar) {
922922
polyReflParam.at(iPar) = mWorkspace->var(Form("polyReflParam%d", iPar));
923-
polyReflParam.at(iPar)->setConstant(kTRUE);
923+
polyReflParam.at(iPar)->setConstant(true);
924924
}
925925
} break;
926926
default:

‎PWGHF/D2H/Macros/HFInvMassFitter.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class HFInvMassFitter : public TNamed
118118
void setFixGaussianMean(double mean)
119119
{
120120
setInitialGaussianMean(mean);
121-
mFixedMean = kTRUE;
121+
mFixedMean = true;
122122
}
123123
void setBoundGaussianMean(double mean, double meanLowLimit, double meanUpLimit)
124124
{
@@ -129,7 +129,7 @@ class HFInvMassFitter : public TNamed
129129
setInitialGaussianMean(mean);
130130
mMassLowLimit = meanLowLimit;
131131
mMassUpLimit = meanUpLimit;
132-
mBoundMean = kTRUE;
132+
mBoundMean = true;
133133
}
134134
void setBoundReflGausMean(double mean, double meanLowLimit, double meanUpLimit)
135135
{
@@ -140,26 +140,26 @@ class HFInvMassFitter : public TNamed
140140
setInitialGaussianMean(mean);
141141
mMassReflLowLimit = meanLowLimit;
142142
mMassReflUpLimit = meanUpLimit;
143-
mBoundReflMean = kTRUE;
143+
mBoundReflMean = true;
144144
}
145145
void setFixGaussianSigma(double sigma)
146146
{
147147
setInitialGaussianSigma(sigma);
148-
mFixedSigma = kTRUE;
148+
mFixedSigma = true;
149149
}
150150
void setBoundGausSigma(double sigma, double sigmaLimit)
151151
{
152152
setInitialGaussianSigma(sigma);
153153
setSigmaLimit(sigma, sigmaLimit);
154-
mBoundSigma = kTRUE;
154+
mBoundSigma = true;
155155
}
156156
void setFixSecondGaussianSigma(double sigma)
157157
{
158158
if (mTypeOfSgnPdf != DoubleGaus) {
159159
printf("Fit type should be 2Gaus!\n");
160160
}
161161
setInitialSecondGaussianSigma(sigma);
162-
mFixedSigmaDoubleGaus = kTRUE;
162+
mFixedSigmaDoubleGaus = true;
163163
}
164164
void setFixFrac2Gaus(double frac)
165165
{
@@ -168,15 +168,15 @@ class HFInvMassFitter : public TNamed
168168
printf("Fit type should be 2Gaus or 2GausSigmaRatio!\n");
169169
}
170170
setInitialFracDoubleGaus(frac);
171-
mFixedFracDoubleGaus = kTRUE;
171+
mFixedFracDoubleGaus = true;
172172
}
173173
void setFixRatioToGausSigma(double sigmaFrac)
174174
{
175175
if (mTypeOfSgnPdf != DoubleGausSigmaRatioPar) {
176176
printf("Fit type should be set to k2GausSigmaRatioPar!\n");
177177
}
178178
setInitialRatioDoubleGausSigma(sigmaFrac);
179-
mFixedRatioDoubleGausSigma = kTRUE;
179+
mFixedRatioDoubleGausSigma = true;
180180
}
181181
void setFixSignalYield(double yield) { mFixedRawYield = yield; }
182182
void setNumberOfSigmaForSidebands(double numberOfSigma) { mNSigmaForSidebands = numberOfSigma; }
@@ -188,12 +188,12 @@ class HFInvMassFitter : public TNamed
188188
void setFixReflOverSgn(double reflOverSgn)
189189
{
190190
setInitialReflOverSgn(reflOverSgn);
191-
mFixReflOverSgn = kTRUE;
191+
mFixReflOverSgn = true;
192192
}
193193
void setTemplateReflections(const TH1* histoRefl)
194194
{
195195
if (histoRefl == nullptr) {
196-
mEnableReflections = kFALSE;
196+
mEnableReflections = false;
197197
return;
198198
}
199199
mHistoTemplateRefl = dynamic_cast<TH1*>(histoRefl->Clone("mHistoTemplateRefl"));

‎PWGHF/D2H/Macros/runMassFitter.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ int runMassFitter(const TString& configFileName)
664664

665665
void setHistoStyle(TH1* histo, Color_t color, Size_t markerSize)
666666
{
667-
histo->SetStats(kFALSE);
667+
histo->SetStats(false);
668668
histo->SetMarkerSize(markerSize);
669669
histo->SetMarkerStyle(20);
670670
histo->SetLineWidth(2);

0 commit comments

Comments
 (0)