Skip to content

[PWGLF,Trigger] Omegamult: added toi mask #11619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skundu692 merged 7 commits into from
Jun 15, 2025
Merged

[PWGLF,Trigger] Omegamult: added toi mask #11619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
23272b6
dev: adding toi mask to table
lietava Jun 9, 2025
7c59b4f
clang
lietava Jun 9, 2025
c477bd7
fixes + zorro getter for number of tois
lietava Jun 9, 2025
3adc303
clang
lietava Jun 9, 2025
bce14da
fix
lietava Jun 14, 2025
04059cc
fixixng part of lintner
lietava Jun 14, 2025
3518e84
zorro
lietava Jun 14, 2025
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
8 changes: 7 additions & 1 deletion EventFiltering/Zorro.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.
//
// Zero Obstacles Results Retriever for Offline trigger selections

///
/// \file Zorro.h
/// \brief Zero Obstacles Results Retriever for Offline trigger selections
/// \author M Puccio
///

#ifndef EVENTFILTERING_ZORRO_H_
#define EVENTFILTERING_ZORRO_H_
Expand Down Expand Up @@ -54,6 +59,7 @@ class Zorro
std::vector<int> getTOIcounters() const { return mTOIcounts; }
std::vector<bool> getTriggerOfInterestResults(uint64_t bcGlobalId, uint64_t tolerance = 100);
std::vector<bool> getTriggerOfInterestResults() const;
int getNTOIs() const { return mTOIs.size(); }

void setCCDBpath(std::string path) { mBaseCCDBPath = path; }
void setBaseCCDBPath(std::string path) { mBaseCCDBPath = path; }
Expand Down
13 changes: 9 additions & 4 deletions PWGLF/DataModel/LFNonPromptCascadeTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Provide mandatory file documentation.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand All @@ -12,7 +12,7 @@
///
/// \file LFNonPromptCascadeTable.h
/// \brief Non prompt cascade tables
///

Check failure on line 15 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \author is missing, incorrect or misplaced.

Check failure on line 15 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \file is missing, incorrect or misplaced.

#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoAHelpers.h"
Expand All @@ -27,7 +27,7 @@
DECLARE_SOA_COLUMN(MatchingChi2, matchingChi2, float);
DECLARE_SOA_COLUMN(DeltaPtITSCascade, deltaPtITSCascade, float);
DECLARE_SOA_COLUMN(DeltaPtCascade, deltaPtCascade, float);
DECLARE_SOA_COLUMN(ITSClusSize, itsClusSize, float);

Check failure on line 30 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(HasReassociatedCluster, hasReassociatedCluster, bool);
DECLARE_SOA_COLUMN(IsGoodMatch, isGoodMatch, bool);
DECLARE_SOA_COLUMN(IsGoodCascade, isGoodCascade, bool);
Expand Down Expand Up @@ -62,8 +62,8 @@
DECLARE_SOA_COLUMN(BachDCAxy, bachDCAxy, float);
DECLARE_SOA_COLUMN(BachDCAz, bachDCAz, float);

DECLARE_SOA_COLUMN(CascCosPA, casccosPA, float);

Check failure on line 65 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(V0CosPA, v0cosPA, float);

Check failure on line 66 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.

DECLARE_SOA_COLUMN(MassXi, massXi, double);
DECLARE_SOA_COLUMN(MassOmega, massOmega, double);
Expand Down Expand Up @@ -98,10 +98,10 @@
DECLARE_SOA_COLUMN(BachKaonTOFNSigma, bachKaonTOFNSigma, float);
DECLARE_SOA_COLUMN(BachPionTOFNSigma, bachPionTOFNSigma, float);

DECLARE_SOA_COLUMN(gPt, genPt, float);

Check failure on line 101 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(gEta, genEta, float);

Check failure on line 102 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(gPhi, genPhi, float);

Check failure on line 103 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(gVx, genVx, float);

Check failure on line 104 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(gVy, genVy, float);
DECLARE_SOA_COLUMN(gVz, genVz, float);
DECLARE_SOA_COLUMN(PDGcode, pdgCode, int);
Expand All @@ -119,6 +119,7 @@
DECLARE_SOA_COLUMN(CentFT0C, centFT0C, float);
DECLARE_SOA_COLUMN(CentFT0A, centFT0A, float);
DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float);
DECLARE_SOA_COLUMN(ToiMask, toiMask, uint32_t);

} // namespace NPCascadeTable
DECLARE_SOA_TABLE(NPCascTable, "AOD", "NPCASCTABLE",
Expand Down Expand Up @@ -183,7 +184,8 @@
NPCascadeTable::MultFT0M,
NPCascadeTable::CentFT0C,
NPCascadeTable::CentFT0A,
NPCascadeTable::CentFT0M)
NPCascadeTable::CentFT0M,
NPCascadeTable::ToiMask)

DECLARE_SOA_TABLE(NPCascTableNT, "AOD", "NPCASCTABLENT",
NPCascadeTable::MatchingChi2,
Expand Down Expand Up @@ -247,7 +249,8 @@
NPCascadeTable::MultFT0M,
NPCascadeTable::CentFT0C,
NPCascadeTable::CentFT0A,
NPCascadeTable::CentFT0M)
NPCascadeTable::CentFT0M,
NPCascadeTable::ToiMask)

DECLARE_SOA_TABLE(NPCascTableMC, "AOD", "NPCASCTABLEMC",
NPCascadeTable::MatchingChi2,
Expand Down Expand Up @@ -330,7 +333,8 @@
NPCascadeTable::DCAzMC,
NPCascadeTable::MCcollisionMatch,
NPCascadeTable::HasFakeReassociation,
NPCascadeTable::MotherDecayDaughters)
NPCascadeTable::MotherDecayDaughters,
NPCascadeTable::ToiMask)

DECLARE_SOA_TABLE(NPCascTableMCNT, "AOD", "NPCASCTABLEMCNT",
NPCascadeTable::MatchingChi2,
Expand Down Expand Up @@ -413,7 +417,8 @@
NPCascadeTable::DCAzMC,
NPCascadeTable::MCcollisionMatch,
NPCascadeTable::HasFakeReassociation,
NPCascadeTable::MotherDecayDaughters)
NPCascadeTable::MotherDecayDaughters,
NPCascadeTable::ToiMask)

DECLARE_SOA_TABLE(NPCascTableGen, "AOD", "NPCASCTABLEGen",
NPCascadeTable::gPt,
Expand Down
38 changes: 28 additions & 10 deletions PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ struct NPCascCandidate {
float centFT0C;
float centFT0A;
float centFT0M;
uint32_t toiMask;
};
std::array<bool, 2> isFromHF(auto& particle)
{
Expand Down Expand Up @@ -287,23 +288,34 @@ struct NonPromptCascadeTask {
return true;
}

void zorroAccounting(const auto& collisions)
void zorroAccounting(const auto& collisions, auto& toiMap)
{
if (cfgSkimmedProcessing) {
int runNumber{-1};
for (const auto& coll : collisions) {
auto bc = coll.template bc_as<aod::BCsWithTimestamps>();
if (runNumber != bc.runNumber()) {
mZorro.initCCDB(mCCDB.service, bc.runNumber(), bc.timestamp(), cfgTriggersOfInterest.value);
if (mZorro.getNTOIs() > 32) {
LOG(fatal) << "N TOIs:" << mZorro.getNTOIs() << " Max 32 TOIs possible.";
}
mZorro.populateHistRegistry(mRegistry, bc.runNumber());
runNumber = bc.runNumber();
}
mZorro.isSelected(bc.globalBC()); /// Just let Zorro do the accounting
bool sel = mZorro.isSelected(bc.globalBC()); /// Just let Zorro do the accounting
if (sel) {
std::vector<bool> toivect = mZorro.getTriggerOfInterestResults();
uint32_t toiMask = 0;
for (size_t i{0}; i < toivect.size(); i++) {
toiMask += toivect[i] << i;
}
toiMap[bc.globalBC()] = toiMask;
}
}
}
}
template <typename TrackType, typename CollisionType>
void fillCandidatesVector(CollisionType const&, TrackType const& tracks, auto const& cascades, auto& candidates)
void fillCandidatesVector(CollisionType const&, TrackType const& tracks, auto const& cascades, auto& candidates, std::map<uint64_t, uint32_t> toiMap = {})
{

const auto& getCascade = [](auto const& candidate) {
Expand Down Expand Up @@ -507,6 +519,10 @@ struct NonPromptCascadeTask {
} else {
o2::base::Propagator::Instance()->propagateToDCA(primaryVertex, ntCascadeTrack, mBz, 2.f, matCorr, &motherDCA);
}
uint32_t toiMask = 0x0;
if (toiMap.count(bc.globalBC())) {
toiMask = toiMap[bc.globalBC()];
}
candidates.emplace_back(NPCascCandidate{mcParticleID, trackedCascGlobalIndex, itsTrackGlobalIndex, candidate.collisionId(), matchingChi2, deltaPtITSCascade, deltaPtCascade, cascITSclsSize, hasReassociatedClusters, hasFakeReassociation, isGoodMatch, isGoodCascade, pdgCodeMom, itsTrackPDG, fromHF[0], fromHF[1],
collision.numContrib(), cascPVContribs, collision.collisionTimeRes(), primaryVertex.getX(), primaryVertex.getY(), primaryVertex.getZ(),
cascadeLvector.pt(), cascadeLvector.eta(), cascadeLvector.phi(),
Expand All @@ -517,7 +533,7 @@ struct NonPromptCascadeTask {
cascITSclusters, protonTrack.itsNCls(), pionTrack.itsNCls(), bachelor.itsNCls(), protonTrack.tpcNClsFound(), pionTrack.tpcNClsFound(), bachelor.tpcNClsFound(),
protonTrack.tpcNSigmaPr(), pionTrack.tpcNSigmaPi(), bachelor.tpcNSigmaKa(), bachelor.tpcNSigmaPi(),
protonTrack.hasTOF(), pionTrack.hasTOF(), bachelor.hasTOF(),
protonTrack.tofNSigmaPr(), pionTrack.tofNSigmaPi(), bachelor.tofNSigmaKa(), bachelor.tofNSigmaPi(), collision.sel8(), collision.multFT0C(), collision.multFT0A(), collision.multFT0M(), collision.centFT0C(), collision.centFT0A(), collision.centFT0M()});
protonTrack.tofNSigmaPr(), pionTrack.tofNSigmaPi(), bachelor.tofNSigmaKa(), bachelor.tofNSigmaPi(), collision.sel8(), collision.multFT0C(), collision.multFT0A(), collision.multFT0M(), collision.centFT0C(), collision.centFT0A(), collision.centFT0M(), toiMask});
}
}

Expand All @@ -537,7 +553,7 @@ struct NonPromptCascadeTask {
c.protonTPCNSigma, c.pionTPCNSigma, c.bachKaonTPCNSigma, c.bachPionTPCNSigma,
c.protonHasTOF, c.pionHasTOF, c.bachHasTOF,
c.protonTOFNSigma, c.pionTOFNSigma, c.bachKaonTOFNSigma, c.bachPionTOFNSigma,
c.sel8, c.multFT0C, c.multFT0A, c.multFT0M, c.centFT0C, c.centFT0A, c.centFT0M);
c.sel8, c.multFT0C, c.multFT0A, c.multFT0M, c.centFT0C, c.centFT0A, c.centFT0M, c.toiMask);
}
}

Expand Down Expand Up @@ -576,7 +592,7 @@ struct NonPromptCascadeTask {
c.sel8, c.multFT0C, c.multFT0A, c.multFT0M, c.centFT0C, c.centFT0A, c.centFT0M,
particle.pt(), particle.eta(), particle.phi(), mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(),
particle.pdgCode(), mcCollision.posX() - particle.vx(), mcCollision.posY() - particle.vy(),
mcCollision.posZ() - particle.vz(), mcCollision.globalIndex() == recCollision.mcCollisionId(), c.hasFakeReassociation, motherDecayDaughters);
mcCollision.posZ() - particle.vz(), mcCollision.globalIndex() == recCollision.mcCollisionId(), c.hasFakeReassociation, motherDecayDaughters, c.toiMask);
}
}

Expand Down Expand Up @@ -653,8 +669,9 @@ struct NonPromptCascadeTask {
aod::V0s const& /*v0s*/, TracksExtData const& tracks,
aod::BCsWithTimestamps const&)
{
zorroAccounting(collisions);
fillCandidatesVector<TracksExtData>(collisions, tracks, trackedCascades, gCandidates);
std::map<uint64_t, uint32_t> toiMap;
zorroAccounting(collisions, toiMap);
fillCandidatesVector<TracksExtData>(collisions, tracks, trackedCascades, gCandidates, toiMap);
fillDataTable<aod::AssignedTrackedCascades>(gCandidates);
}
PROCESS_SWITCH(NonPromptCascadeTask, processTrackedCascadesData, "process cascades from strangeness tracking: Data analysis", false);
Expand All @@ -663,8 +680,9 @@ struct NonPromptCascadeTask {
aod::V0s const& /*v0s*/, TracksExtData const& tracks,
aod::BCsWithTimestamps const&)
{
zorroAccounting(collisions);
fillCandidatesVector<TracksExtData>(collisions, tracks, cascades, gCandidatesNT);
std::map<uint64_t, uint32_t> toiMap;
zorroAccounting(collisions, toiMap);
fillCandidatesVector<TracksExtData>(collisions, tracks, cascades, gCandidatesNT, toiMap);
fillDataTable<aod::Cascades>(gCandidatesNT);
}
PROCESS_SWITCH(NonPromptCascadeTask, processCascadesData, "process cascades: Data analysis", false);
Expand Down
Loading