Skip to content

Commit

Permalink
Merge branch 'master' into mftextras
Browse files Browse the repository at this point in the history
  • Loading branch information
@ddobrigk
ddobrigk authored Dec 13, 2024
2 parents 0544ca7 + 600bd24 commit dbf2e75
Show file tree
Hide file tree
Showing 34 changed files with 2,772 additions and 938 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/mega-linter.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
id: ml
# You can override MegaLinter flavor used to have faster performances
# More info at https://megalinter.io/flavors/
uses: oxsecurity/megalinter@v8.1.0
uses: oxsecurity/megalinter@v8.3.0
env:
# All available variables are described in documentation:
# https://megalinter.io/configuration/
Expand Down
2 changes: 1 addition & 1 deletion Common/TableProducer/Converters/trackQA002Converter.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ using namespace o2::framework;
struct TrackQAConverter002 {
Produces<aod::TracksQA_002> tracksQA_002;

void process000(aod::TracksQA_000 const& tracksQA_001)
void process000(aod::TracksQA_000 const& tracksQA_000)
{
for (const auto& trackQA : tracksQA_001) {
tracksQA_002(
Expand Down
447 changes: 226 additions & 221 deletions DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
View file

Large diffs are not rendered by default.

105 changes: 90 additions & 15 deletions EventFiltering/PWGHF/HFFilter.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,27 @@
/// \author Biao Zhang <[email protected]>, CCNU
/// \author Federica Zanone <[email protected]>, Heidelberg University

#include <array>
#include <memory>
#include <string>
#include <vector>

#include "TRandom3.h"

#include "CommonConstants/PhysicsConstants.h"
#include "CCDB/BasicCCDBManager.h"
#include "DataFormatsParameters/GRPMagField.h"
#include "DataFormatsParameters/GRPObject.h"
#include "DCAFitter/DCAFitterN.h"
#include "DetectorsBase/Propagator.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/ASoAHelpers.h"
#include "Framework/HistogramRegistry.h"
#include "Framework/runDataProcessing.h"
#include "ReconstructionDataFormats/DCA.h"

#include "Common/Core/RecoDecay.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/CollisionAssociationTables.h"
#include "Common/DataModel/EventSelection.h"
Expand All @@ -41,6 +49,7 @@

#include "EventFiltering/filterTables.h"
#include "EventFiltering/PWGHF/HFFilterHelpers.h"
#include "PWGHF/Utils/utilsTrkCandHf.h"

using namespace o2;
using namespace o2::analysis;
Expand All @@ -59,6 +68,7 @@ struct HfFilter { // Main struct for HF triggers
Configurable<int> activateQA{"activateQA", 0, "flag to enable QA histos (0 no QA, 1 basic QA, 2 extended QA, 3 very extended QA)"};
Configurable<bool> applyEventSelection{"applyEventSelection", true, "flag to enable event selection (sel8 + Zvt and possibly time-frame border cut)"};
Configurable<bool> applyTimeFrameBorderCut{"applyTimeFrameBorderCut", true, "flag to enable time-frame border cut"};
Configurable<bool> activateSecVtx{"activateSecVtx", false, "flag to enable 2nd vertex fitting - only beauty hadrons"};

// parameters for all triggers
// nsigma PID (except for V0 and cascades)
Expand All @@ -76,6 +86,8 @@ struct HfFilter { // Main struct for HF triggers
Configurable<LabeledArray<double>> cutsTrackBeauty4Prong{"cutsTrackBeauty4Prong", {hf_cuts_single_track::cutsTrack[0], hf_cuts_single_track::nBinsPtTrack, hf_cuts_single_track::nCutVarsTrack, hf_cuts_single_track::labelsPtTrack, hf_cuts_single_track::labelsCutVarTrack}, "Single-track selections per pT bin for 4-prong beauty candidates"};
Configurable<std::string> paramCharmMassShape{"paramCharmMassShape", "2023_pass3", "Parametrisation of charm-hadron mass shape (options: 2023_pass3)"};
Configurable<float> numSigmaDeltaMassCharmHad{"numSigmaDeltaMassCharmHad", 2.5, "Number of sigma for charm-hadron delta mass cut in B and D resonance triggers"};
Configurable<std::vector<double>> pTBinsBHadron{"pTBinsBHadron", std::vector<double>{hf_trigger_cuts_presel_beauty::vecBinsPt}, "pT bin limits for beauty hadrons preselections"};
Configurable<LabeledArray<double>> cutsBplus{"cutsBplus", {hf_trigger_cuts_presel_beauty::cuts[0], hf_trigger_cuts_presel_beauty::nBinsPt, hf_trigger_cuts_presel_beauty::nCutVars, hf_trigger_cuts_presel_beauty::labelsPt, hf_trigger_cuts_presel_beauty::labelsRowsTopolBeauty}, "B+ candidate selection per pT bin"};

// parameters for femto triggers
Configurable<float> femtoMaxRelativeMomentum{"femtoMaxRelativeMomentum", 2., "Maximal allowed value for relative momentum between charm-proton pairs in GeV/c"};
Expand Down Expand Up @@ -135,6 +147,9 @@ struct HfFilter { // Main struct for HF triggers
// array of BDT thresholds
std::array<LabeledArray<double>, kNCharmParticles> thresholdBDTScores;

o2::vertexing::DCAFitterN<2> df2; // fitter for Charm Hadron vertex (2-prong vertex fitter)
o2::vertexing::DCAFitterN<2> dfB; // fitter for Beauty Hadron vertex (2-prong vertex fitter)

HistogramRegistry registry{"registry"};
std::shared_ptr<TH1> hProcessedEvents;

Expand All @@ -151,6 +166,9 @@ struct HfFilter { // Main struct for HF triggers
std::array<std::shared_ptr<TH2>, kNV0> hArmPod{};
std::shared_ptr<TH2> hV0Selected;
std::shared_ptr<TH1> hMassXi;
std::array<std::shared_ptr<TH2>, kNBeautyParticles> hCpaVsPtB{};
std::array<std::shared_ptr<TH2>, kNBeautyParticles> hDecayLengthVsPtB{};
std::array<std::shared_ptr<TH2>, kNBeautyParticles> hImpactParamProductVsPtB{};

// material correction for track propagation
o2::base::MatLayerCylSet* lut;
Expand All @@ -164,12 +182,14 @@ struct HfFilter { // Main struct for HF triggers
{
helper.setHighPtTriggerThresholds(ptThresholds->get(0u, 0u), ptThresholds->get(0u, 1u));
helper.setPtBinsSingleTracks(pTBinsTrack);
helper.setPtBinsBeautyHadrons(pTBinsBHadron);
helper.setPtLimitsBeautyBachelor(ptCuts->get(0u, 0u), ptCuts->get(1u, 0u));
helper.setPtLimitsDstarSoftPion(ptCuts->get(0u, 1u), ptCuts->get(1u, 1u));
helper.setPtLimitsProtonForFemto(ptCuts->get(0u, 2u), ptCuts->get(1u, 2u));
helper.setPtLimitsCharmBaryonBachelor(ptCuts->get(0u, 3u), ptCuts->get(1u, 3u));
helper.setCutsSingleTrackBeauty(cutsTrackBeauty3Prong, cutsTrackBeauty4Prong);
helper.setCutsSingleTrackCharmBaryonBachelor(cutsTrackCharmBaryonBachelor);
helper.setCutsBplus(cutsBplus);
helper.setPtThresholdPidStrategyForFemto(ptThresholdForFemtoPid);
helper.setNsigmaProtonCutsForFemto(std::array{nSigmaPidCuts->get(0u, 3u), nSigmaPidCuts->get(1u, 3u), nSigmaPidCuts->get(2u, 3u)});
helper.setNsigmaProtonCutsForCharmBaryons(nSigmaPidCuts->get(0u, 0u), nSigmaPidCuts->get(1u, 0u));
Expand All @@ -184,7 +204,10 @@ struct HfFilter { // Main struct for HF triggers
helper.setPtRangeSoftPiSigmaC(ptCuts->get(0u, 4u), ptCuts->get(1u, 4u));
helper.setPtDeltaMassRangeSigmaC(cutsPtDeltaMassCharmReso->get(0u, 6u), cutsPtDeltaMassCharmReso->get(1u, 6u), cutsPtDeltaMassCharmReso->get(0u, 7u), cutsPtDeltaMassCharmReso->get(1u, 7u), cutsPtDeltaMassCharmReso->get(0u, 8u), cutsPtDeltaMassCharmReso->get(1u, 8u), cutsPtDeltaMassCharmReso->get(0u, 9u), cutsPtDeltaMassCharmReso->get(1u, 9u), cutsPtDeltaMassCharmReso->get(2u, 6u), cutsPtDeltaMassCharmReso->get(2u, 7u), cutsPtDeltaMassCharmReso->get(2u, 8u), cutsPtDeltaMassCharmReso->get(2u, 9u));
helper.setPtRangeSoftKaonXicResoToSigmaC(ptCuts->get(0u, 5u), ptCuts->get(1u, 5u));

if (activateSecVtx) {
helper.setVtxConfiguration(df2, false); // (DCAFitterN, useAbsDCA)
helper.setVtxConfiguration(dfB, true);
}
hProcessedEvents = registry.add<TH1>("fProcessedEvents", "HF - event filtered;;counts", HistType::kTH1F, {{kNtriggersHF + 2, -0.5, +kNtriggersHF + 1.5}});
for (auto iBin = 0; iBin < kNtriggersHF + 2; ++iBin) {
if (iBin < 2)
Expand Down Expand Up @@ -230,7 +253,21 @@ struct HfFilter { // Main struct for HF triggers

for (int iBeautyPart{0}; iBeautyPart < kNBeautyParticles; ++iBeautyPart) {
hMassVsPtB[iBeautyPart] = registry.add<TH2>(Form("fMassVsPt%s", beautyParticleNames[iBeautyPart].data()), Form("#it{M} vs. #it{p}_{T} distribution of triggered %s candidates;#it{p}_{T} (GeV/#it{c});#it{M} (GeV/#it{c}^{2});counts", beautyParticleNames[iBeautyPart].data()), HistType::kTH2F, {ptAxis, massAxisB[iBeautyPart]});
hCpaVsPtB[iBeautyPart] = registry.add<TH2>(Form("fCpaVsPt%s", beautyParticleNames[iBeautyPart].data()), Form("CPA vs. #it{p}_{T} distribution of triggered %s candidates;#it{p}_{T} (GeV/#it{c});#it{M} (GeV/#it{c}^{2});counts", beautyParticleNames[iBeautyPart].data()), HistType::kTH2F, {ptAxis, {100, -1, 1}});
hDecayLengthVsPtB[iBeautyPart] = registry.add<TH2>(Form("fDecayLengthVsPt%s", beautyParticleNames[iBeautyPart].data()), Form("DecayLength vs. #it{p}_{T} distribution of triggered %s candidates;#it{p}_{T} (GeV/#it{c});#it{M} (GeV/#it{c}^{2});counts", beautyParticleNames[iBeautyPart].data()), HistType::kTH2F, {ptAxis, {100, 0, 20}});
hImpactParamProductVsPtB[iBeautyPart] = registry.add<TH2>(Form("fImpactParamProductVsPt%s", beautyParticleNames[iBeautyPart].data()), Form("ImpactParamProduct vs. #it{p}_{T} distribution of triggered %s candidates;#it{p}_{T} (GeV/#it{c});#it{M} (GeV/#it{c}^{2});counts", beautyParticleNames[iBeautyPart].data()), HistType::kTH2F, {ptAxis, {100, -2.5, +2.5}});
}
constexpr int kNBinsHfVtxStages = kNHfVtxStage;
std::string labels[kNBinsHfVtxStages];
labels[HfVtxStage::Skimmed] = "Skimm CharmHad-Pi pairs";
labels[HfVtxStage::BeautyVertex] = "vertex CharmHad-Pi pairs";
labels[HfVtxStage::CharmHadPiSelected] = "selected CharmHad-Pi pairs";
static const AxisSpec axisHfVtxStages = {kNBinsHfVtxStages, 0.5, kNBinsHfVtxStages + 0.5, ""};
registry.add("fHfVtxStages", "HfVtxStages;;entries", HistType::kTH1F, {axisHfVtxStages});
for (int iBin = 0; iBin < kNBinsHfVtxStages; iBin++) {
registry.get<TH1>(HIST("fHfVtxStages"))->GetXaxis()->SetBinLabel(iBin + 1, labels[iBin].data());
}

for (int iV0{kPhoton}; iV0 < kNV0; ++iV0) {
hArmPod[iV0] = registry.add<TH2>(Form("fArmPod%s", v0Names[iV0].data()), Form("Armenteros Podolanski plot for selected %s;#it{#alpha};#it{q}_{T} (GeV/#it{c})", v0Labels[iV0].data()), HistType::kTH2F, {alphaAxis, qtAxis});
}
Expand Down Expand Up @@ -267,7 +304,7 @@ struct HfFilter { // Main struct for HF triggers
}

using BigTracksMCPID = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa, aod::pidTPCFullPr, aod::pidTOFFullPr, aod::McTrackLabels>;
using BigTracksPID = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa, aod::pidTPCFullPr, aod::pidTOFFullPr>;
using BigTracksPID = soa::Join<aod::Tracks, aod::TracksWCovDcaExtra, aod::TracksDCA, aod::TrackSelection, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa, aod::pidTPCFullPr, aod::pidTOFFullPr>;
using CollsWithEvSel = soa::Join<aod::Collisions, aod::EvSels>;

using Hf2ProngsWithMl = soa::Join<aod::Hf2Prongs, aod::Hf2ProngMlProbs>;
Expand Down Expand Up @@ -342,8 +379,8 @@ struct HfFilter { // Main struct for HF triggers
continue;
}

auto trackParPos = getTrackPar(trackPos);
auto trackParNeg = getTrackPar(trackNeg);
auto trackParPos = getTrackParCov(trackPos);
auto trackParNeg = getTrackParCov(trackNeg);
o2::gpu::gpustd::array<float, 2> dcaPos{trackPos.dcaXY(), trackPos.dcaZ()};
o2::gpu::gpustd::array<float, 2> dcaNeg{trackNeg.dcaXY(), trackNeg.dcaZ()};
std::array<float, 3> pVecPos{trackPos.pVector()};
Expand Down Expand Up @@ -418,7 +455,7 @@ struct HfFilter { // Main struct for HF triggers
continue;
}

auto trackParThird = getTrackPar(track);
auto trackParThird = getTrackParCov(track);
o2::gpu::gpustd::array<float, 2> dcaThird{track.dcaXY(), track.dcaZ()};
std::array<float, 3> pVecThird = track.pVector();
if (track.collisionId() != thisCollId) {
Expand All @@ -432,14 +469,52 @@ struct HfFilter { // Main struct for HF triggers
auto massCand = RecoDecay::m(std::array{pVec2Prong, pVecThird}, std::array{massD0, massPi});
auto pVecBeauty3Prong = RecoDecay::pVec(pVec2Prong, pVecThird);
auto ptCand = RecoDecay::pt(pVecBeauty3Prong);
if (TESTBIT(isTrackSelected, kForBeauty) && std::fabs(massCand - massBPlus) <= deltaMassBeauty->get(0u, 0u)) {
keepEvent[kBeauty3P] = true;
// fill optimisation tree for D0
if (applyOptimisation) {
optimisationTreeBeauty(thisCollId, o2::constants::physics::Pdg::kD0, pt2Prong, scores[0], scores[1], scores[2], dcaThird[0]);
}
if (TESTBIT(isTrackSelected, kForBeauty) && helper.isSelectedBplusInMassRange(ptCand, massCand)) {
if (activateQA) {
hMassVsPtB[kBplus]->Fill(ptCand, massCand);
registry.fill(HIST("fHfVtxStages"), 1 + HfVtxStage::Skimmed);
}
if (!activateSecVtx) {
keepEvent[kBeauty3P] = true;
// fill optimisation tree for D0
if (applyOptimisation) {
optimisationTreeBeauty(thisCollId, o2::constants::physics::Pdg::kD0, pt2Prong, scores[0], scores[1], scores[2], dcaThird[0]);
}
if (activateQA) {
hMassVsPtB[kBplus]->Fill(ptCand, massCand);
}
} else {
df2.process(trackParPos, trackParNeg);
df2.getTrack(0).getPxPyPzGlo(pVecPos);
df2.getTrack(1).getPxPyPzGlo(pVecNeg);
auto trackParD = df2.createParentTrackParCov();
trackParD.setAbsCharge(0); // to be sure
auto pVec2Prong = RecoDecay::pVec(pVecPos, pVecNeg);
if (dfB.process(trackParD, trackParThird) != 0) {
if (activateQA) {
registry.fill(HIST("fHfVtxStages"), 1 + HfVtxStage::BeautyVertex);
}
const auto& secondaryVertexBplus = dfB.getPCACandidate();
dfB.propagateTracksToVertex();
dfB.getTrack(0).getPxPyPzGlo(pVec2Prong);
dfB.getTrack(1).getPxPyPzGlo(pVecThird);
o2::gpu::gpustd::array<float, 2> dca2Prong; //{trackParD.dcaXY(), trackParD.dcaZ()};
o2::base::Propagator::Instance()->propagateToDCABxByBz({collision.posX(), collision.posY(), collision.posZ()}, trackParD, 2.f, noMatCorr, &dca2Prong);
bool isBplus = helper.isSelectedBplus(pVec2Prong, pVecThird, dca2Prong, dcaThird, std::array<double, 3>{static_cast<double>(collision.posX()), static_cast<double>(collision.posY()), static_cast<double>(collision.posZ())}, std::array{secondaryVertexBplus[0], secondaryVertexBplus[1], secondaryVertexBplus[2]});
if (isBplus) {
keepEvent[kBeauty3P] = true;
// fill optimisation tree for D0
if (applyOptimisation) {
optimisationTreeBeauty(thisCollId, o2::constants::physics::Pdg::kD0, pt2Prong, scores[0], scores[1], scores[2], dcaThird[0]);
}
if (activateQA) {
registry.fill(HIST("fHfVtxStages"), 1 + HfVtxStage::CharmHadPiSelected);
hCpaVsPtB[kBplus]->Fill(RecoDecay::pt(RecoDecay::pVec(pVec2Prong, pVecThird)), RecoDecay::cpa(std::array<double, 3>{static_cast<double>(collision.posX()), static_cast<double>(collision.posY()), static_cast<double>(collision.posZ())}, std::array{secondaryVertexBplus[0], secondaryVertexBplus[1], secondaryVertexBplus[2]}, RecoDecay::pVec(pVec2Prong, pVecThird)));
hDecayLengthVsPtB[kBplus]->Fill(RecoDecay::pt(RecoDecay::pVec(pVec2Prong, pVecThird)), RecoDecay::distance(std::array<double, 3>{static_cast<double>(collision.posX()), static_cast<double>(collision.posY()), static_cast<double>(collision.posZ())}, std::array{secondaryVertexBplus[0], secondaryVertexBplus[1], secondaryVertexBplus[2]}));
hImpactParamProductVsPtB[kBplus]->Fill(RecoDecay::pt(RecoDecay::pVec(pVec2Prong, pVecThird)), dca2Prong[0] * dcaThird[0]);
hMassVsPtB[kBplus]->Fill(ptCand, massCand);
}
}
}
}
}
}
Expand Down Expand Up @@ -990,9 +1065,9 @@ struct HfFilter { // Main struct for HF triggers
}
}
} // end SigmaC++ candidate
} // end loop over tracks (soft pi)
} // end candidate Lc->pKpi
} // end loop over tracks
} // end loop over tracks (soft pi)
} // end candidate Lc->pKpi
} // end loop over tracks

// Ds with photon
bool isGoodDsToKKPi = (isSignalTagged[kDs - 1]) && TESTBIT(is3ProngInMass[kDs - 1], 0);
Expand Down
Loading

0 comments on commit dbf2e75

Please sign in to comment.