Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include "CCDB/BasicCCDBManager.h"
#include "Framework/Configurable.h"

#include <TH1.h>

#include <algorithm>
#include <map>
#include <string>
Expand All @@ -36,7 +38,7 @@ enum ParticleNo : size_t {
};

template <size_t T>
concept isOneOrTwo = T == ParticleNo::ONE || T == ParticleNo::TWO;
concept IsOneOrTwo = T == ParticleNo::ONE || T == ParticleNo::TWO;

template <typename T>
consteval auto getHistDim() -> int
Expand Down Expand Up @@ -104,7 +106,7 @@ class EfficiencyCalculator
auto hEff = hLoaded[partNo - 1];

if (shouldApplyCorrections && hEff) {
auto bin = hEff->FindBin(binVars...);
auto bin = hEff->FindBin(static_cast<double>(binVars)...);
auto eff = hEff->GetBinContent(bin);
weight /= eff > 0 ? eff : 1.0f;
}
Expand Down Expand Up @@ -149,16 +151,19 @@ class EfficiencyCalculator
LOGF(warn, notify("Histogram \"%s/%ld\" has been loaded, but it is empty"), config->confCCDBPath.value, timestamp);
}

auto clonedEffHist = static_cast<HistType*>(hEff->Clone());
clonedEffHist->SetDirectory(nullptr);

LOGF(info, notify("Successfully loaded %ld"), timestamp);
return hEff;
return clonedEffHist;
}

EfficiencyConfigurableGroup* config{};

bool shouldApplyCorrections = false;

o2::ccdb::BasicCCDBManager& ccdb{o2::ccdb::BasicCCDBManager::instance()};
std::array<HistType*, 2> hLoaded{};
std::array<HistType*, 2> hLoaded{nullptr, nullptr};
};

} // namespace o2::analysis::femto_universe::efficiency
Expand Down
4 changes: 2 additions & 2 deletions PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1346,8 +1346,8 @@ struct FemtoUniversePairTaskTrackD0 {
mcRecoRegistry.fill(HIST("hMcRecD0PromptPhi"), part.phi());
} else if (part.tpcNClsFound() == 1) { // non-prompt candidates
mcRecoRegistry.fill(HIST("hMcRecD0NonPrompt"), part.pt(), part.eta());
mcRecoRegistry.fill(HIST("hMcRecD0PromptPt"), part.pt());
mcRecoRegistry.fill(HIST("hMcRecD0PromptPhi"), part.phi());
mcRecoRegistry.fill(HIST("hMcRecD0NonPromptPt"), part.pt());
mcRecoRegistry.fill(HIST("hMcRecD0NonPromptPhi"), part.phi());
}
} else if (mcpart.pdgMCTruth() == ConfDmesons.confPDGCodeD0bar) {
mcRecoRegistry.fill(HIST("hMcRecD0bar"), part.pt(), part.eta());
Expand Down
Loading