Skip to content

Commit a618ddc

Browse files
committed
Mass fitter: Fix nullptr dereference. Remove unused code.
1 parent ab76bd0 commit a618ddc

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

PWGHF/D2H/Macros/HFInvMassFitter.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,11 @@ class HFInvMassFitter : public TNamed
188188
setInitialReflOverSgn(reflOverSgn);
189189
mFixReflOverSgn = kTRUE;
190190
}
191-
void setTemplateReflections(const TH1* histoRefl, Int_t fitTypeRefl = DoubleGaus)
191+
void setTemplateReflections(const TH1* histoRefl)
192192
{
193193
if (histoRefl == nullptr) {
194194
mEnableReflections = kFALSE;
195+
return;
195196
}
196197
mHistoTemplateRefl = dynamic_cast<TH1*>(histoRefl->Clone("mHistoTemplateRefl"));
197198
}

PWGHF/D2H/Macros/runMassFitter.C

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -378,11 +378,6 @@ int runMassFitter(const TString& configFileName)
378378
}
379379

380380
Double_t reflOverSgn = 0;
381-
double markerSize = 1.;
382-
constexpr int NSliceVarBinsLarge = 15;
383-
if (nSliceVarBins > NSliceVarBinsLarge) {
384-
markerSize = 0.5;
385-
}
386381

387382
if (isMc) {
388383
HFInvMassFitter* massFitter;
@@ -439,7 +434,7 @@ int runMassFitter(const TString& configFileName)
439434
massFitter->setUseLikelihoodFit();
440435
}
441436

442-
auto setFixedValue = [&massFitter, &iSliceVar](bool const& isFix, std::vector<double> const& fixManual, const TH1* histToFix, std::function<void(Double_t)> setFunc, std::string const& var) -> void {
437+
auto setFixedValue = [&iSliceVar](bool const& isFix, std::vector<double> const& fixManual, const TH1* histToFix, std::function<void(Double_t)> setFunc, std::string const& var) -> void {
443438
if (isFix) {
444439
if (fixManual.empty()) {
445440
setFunc(histToFix->GetBinContent(iSliceVar + 1));
@@ -463,7 +458,7 @@ int runMassFitter(const TString& configFileName)
463458
reflOverSgn = hMassForSgn[iSliceVar]->Integral(hMassForSgn[iSliceVar]->FindBin(massMin[iSliceVar] * 1.0001), hMassForSgn[iSliceVar]->FindBin(massMax[iSliceVar] * 0.999));
464459
reflOverSgn = hMassForRefl[iSliceVar]->Integral(hMassForRefl[iSliceVar]->FindBin(massMin[iSliceVar] * 1.0001), hMassForRefl[iSliceVar]->FindBin(massMax[iSliceVar] * 0.999)) / reflOverSgn;
465460
massFitter->setFixReflOverSgn(reflOverSgn);
466-
massFitter->setTemplateReflections(hMassRefl[iSliceVar], HFInvMassFitter::DoubleGaus);
461+
massFitter->setTemplateReflections(hMassRefl[iSliceVar]);
467462
}
468463

469464
massFitter->doFit();

0 commit comments

Comments
 (0)