Skip to content
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

[PWGLF] Changes in h-Strangeness correlation code #9201

Merged
merged 2 commits into from
Jan 22, 2025
+204 −102
Merged

[PWGLF] Changes in h-Strangeness correlation code #9201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43c5ec7
using template function for assoc hadrons
Jan 10, 2025
903ef18
fix
Jan 10, 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
31 changes: 23 additions & 8 deletions PWGLF/DataModel/LFHStrangeCorrelationTables.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 warning on line 1 in PWGLF/DataModel/LFHStrangeCorrelationTables.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 @@ -17,7 +17,7 @@
/// \author Kai Cui (kaicui@mails.ccnu.edu.cn)
/// \author Lucia Anna Tarasovicova (lucia.anna.husova@cern.ch)
/// \author David Dobrigkeit Chinellato (david.dobrigkeit.chinellato@cern.ch)
/// \author Zhongbao Yin (Zhong-Bao.Yin@cern.ch)

Check warning on line 20 in PWGLF/DataModel/LFHStrangeCorrelationTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \file is missing, incorrect or misplaced.

#ifndef PWGLF_DATAMODEL_LFHSTRANGECORRELATIONTABLES_H_
#define PWGLF_DATAMODEL_LFHSTRANGECORRELATIONTABLES_H_
Expand All @@ -28,7 +28,7 @@
#include "CommonConstants/PhysicsConstants.h"

// Simple checker
#define bitcheck(var, nbit) ((var) & (1 << (nbit)))

Check warning on line 31 in PWGLF/DataModel/LFHStrangeCorrelationTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/macro] 

Use SCREAMING_SNAKE_CASE for names of macros. Leading and double underscores are not allowed.

namespace o2::aod
{
Expand All @@ -37,26 +37,41 @@
namespace triggerTracks
{
DECLARE_SOA_INDEX_COLUMN(Collision, collision); //!
DECLARE_SOA_COLUMN(MCPhysicalPrimary, mcPhysicalPrimary, bool); // true physical primary flag

Check warning on line 40 in PWGLF/DataModel/LFHStrangeCorrelationTables.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_INDEX_COLUMN_FULL(Track, track, int, Tracks, "_Trigger"); //!
DECLARE_SOA_COLUMN(MCOriginalPt, mcOriginalPt, float); // true generated pt

Check warning on line 42 in PWGLF/DataModel/LFHStrangeCorrelationTables.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.
} // namespace triggerTracks
DECLARE_SOA_TABLE(TriggerTracks, "AOD", "TRIGGERTRACKS", o2::soa::Index<>, triggerTracks::CollisionId, triggerTracks::MCPhysicalPrimary, triggerTracks::TrackId, triggerTracks::MCOriginalPt);
namespace triggerTrackExtras
{
DECLARE_SOA_COLUMN(Extra, extra, int); // true physical primary flag
} // namespace triggerTrackExtras
DECLARE_SOA_TABLE(TriggerTrackExtras, "AOD", "TRIGGERTRACKEXTRAs", triggerTrackExtras::Extra);
/// _________________________________________
/// Table for storing assoc track indices
namespace assocPions
{
DECLARE_SOA_INDEX_COLUMN(Collision, collision); //!
DECLARE_SOA_INDEX_COLUMN_FULL(Track, track, int, Tracks, "_Assoc"); //!
} // namespace assocPions
DECLARE_SOA_TABLE(AssocPions, "AOD", "ASSOCPIONS", o2::soa::Index<>, assocPions::CollisionId, assocPions::TrackId);

namespace assocHadrons
{
DECLARE_SOA_INDEX_COLUMN(Collision, collision); //!
DECLARE_SOA_COLUMN(MCPhysicalPrimary, mcPhysicalPrimary, bool); // true physical primary flag

Check warning on line 55 in PWGLF/DataModel/LFHStrangeCorrelationTables.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_INDEX_COLUMN_FULL(Track, track, int, Tracks, "_Assoc"); //!
DECLARE_SOA_COLUMN(MCOriginalPt, mcOriginalPt, float); // true generated pt

Check warning on line 57 in PWGLF/DataModel/LFHStrangeCorrelationTables.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.
} // namespace assocHadrons
DECLARE_SOA_TABLE(AssocHadrons, "AOD", "ASSOCHADRONS", o2::soa::Index<>, assocHadrons::CollisionId, assocHadrons::TrackId);
DECLARE_SOA_TABLE(AssocHadrons, "AOD", "ASSOCHADRONS", o2::soa::Index<>, assocHadrons::CollisionId, assocHadrons::MCPhysicalPrimary, assocHadrons::TrackId, assocHadrons::MCOriginalPt);
/// _________________________________________
/// Table for storing assoc track PID
namespace assocPID
{
DECLARE_SOA_COLUMN(NSigmaTPCPi, nSigmaTPCPi, float);
DECLARE_SOA_COLUMN(NSigmaTPCKa, nSigmaTPCKa, float);
DECLARE_SOA_COLUMN(NSigmaTPCPr, nSigmaTPCPr, float);
DECLARE_SOA_COLUMN(NSigmaTPCEl, nSigmaTPCEl, float);
DECLARE_SOA_COLUMN(NSigmaTOFPi, nSigmaTOFPi, float);
DECLARE_SOA_COLUMN(NSigmaTOFKa, nSigmaTOFKa, float);
DECLARE_SOA_COLUMN(NSigmaTOFPr, nSigmaTOFPr, float);
DECLARE_SOA_COLUMN(NSigmaTOFEl, nSigmaTOFEl, float);
} // namespace assocPID
DECLARE_SOA_TABLE(AssocPID, "AOD", "ASSOCPID", assocPID::NSigmaTPCPi, assocPID::NSigmaTPCKa, assocPID::NSigmaTPCPr, assocPID::NSigmaTPCEl, assocPID::NSigmaTOFPi, assocPID::NSigmaTOFKa, assocPID::NSigmaTOFPr, assocPID::NSigmaTOFEl);

/// _________________________________________
/// Table for storing associated V0 indices
namespace assocV0s
Expand All @@ -69,9 +84,9 @@
DECLARE_SOA_COLUMN(CompatibleLambda, compatibleLambda, int); // compatible with Lambda dEdx, encoded syst checks
DECLARE_SOA_COLUMN(CompatibleAntiLambda, compatibleAntiLambda, int); // compatible with AntiLambda dEdx, encoded syst checks

DECLARE_SOA_COLUMN(MCTrueK0Short, mcTrueK0Short, bool); // true K0Short in MC

Check warning on line 87 in PWGLF/DataModel/LFHStrangeCorrelationTables.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(MCTrueLambda, mcTrueLambda, bool); // true Lambda in MC

Check warning on line 88 in PWGLF/DataModel/LFHStrangeCorrelationTables.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(MCTrueAntiLambda, mcTrueAntiLambda, bool); // true AntiLambda in MC

Check warning on line 89 in PWGLF/DataModel/LFHStrangeCorrelationTables.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(MCPhysicalPrimary, mcPhysicalPrimary, bool); // true physical primary flag
DECLARE_SOA_COLUMN(NSigmaMassK0Short, nSigmaMassK0Short, float); //
DECLARE_SOA_COLUMN(NSigmaMassLambda, nSigmaMassLambda, float); //
Expand Down
206 changes: 140 additions & 66 deletions PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ struct hstrangecorrelationfilter {
// Track quality
Configurable<int> minTPCNCrossedRows{"minTPCNCrossedRows", 70, "Minimum TPC crossed rows"};
Configurable<bool> triggerRequireITS{"triggerRequireITS", true, "require ITS signal in trigger tracks"};
Configurable<bool> assocRequireITS{"assocRequireITS", true, "require ITS signal in assoc tracks"};
Configurable<int> triggerMaxTPCSharedClusters{"triggerMaxTPCSharedClusters", 200, "maximum number of shared TPC clusters (inclusive)"};
Configurable<bool> triggerRequireL0{"triggerRequireL0", false, "require ITS L0 cluster for trigger"};

Expand Down Expand Up @@ -136,17 +137,21 @@ struct hstrangecorrelationfilter {

using V0LinkedTagged = soa::Join<aod::V0sLinked, aod::V0Tags>;
using CascadesLinkedTagged = soa::Join<aod::CascadesLinked, aod::CascTags>;
using FullTracks = soa::Join<aod::Tracks, aod::TracksExtra>;
using FullTracksMC = soa::Join<aod::Tracks, aod::TracksExtra, aod::McTrackLabels>;
using DauTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::pidTPCFullPi, aod::pidTPCFullKa, aod::pidTPCFullPr, aod::TracksDCA>;
using DauTracksMC = soa::Join<aod::Tracks, aod::TracksExtra, aod::pidTPCFullPi, aod::pidTPCFullKa, aod::pidTPCFullPr, aod::TracksDCA, aod::McTrackLabels>;
// using IDTracks= soa::Join<aod::Tracks, aod::TracksExtra, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidBayesPi, aod::pidBayesKa, aod::pidBayesPr, aod::TOFSignal>; // prepared for Bayesian PID
using IDTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa, aod::pidTPCFullPr, aod::pidTOFFullPr, aod::TOFSignal, aod::TracksDCA>;
using IDTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa, aod::pidTPCFullPr, aod::pidTOFFullPr, aod::pidTPCFullEl, aod::pidTOFFullEl, aod::TOFSignal, aod::TracksDCA>;
using IDTracksMC = soa::Join<aod::Tracks, aod::TracksExtra, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa, aod::pidTPCFullPr, aod::pidTOFFullPr, aod::pidTPCFullEl, aod::pidTOFFullEl, aod::TOFSignal, aod::TracksDCA, aod::McTrackLabels>;
using V0DatasWithoutTrackX = soa::Join<aod::V0Indices, aod::V0Cores>;

Produces<aod::TriggerTracks> triggerTrack;
Produces<aod::AssocPions> assocPion;
Produces<aod::TriggerTrackExtras> triggerTrackExtra;
Produces<aod::AssocV0s> assocV0;
Produces<aod::AssocCascades> assocCascades;
Produces<aod::AssocHadrons> assocHadrons;
Produces<aod::AssocPID> assocPID;

TF1* fK0Mean = new TF1("fK0Mean", "[0]+[1]*x+[2]*TMath::Exp(-[3]*x)");
TF1* fK0Width = new TF1("fK0Width", "[0]+[1]*x+[2]*TMath::Exp(-[3]*x)");
Expand Down Expand Up @@ -221,9 +226,83 @@ struct hstrangecorrelationfilter {
}
return true;
}
template <class TTrack>
bool isValidAssocTrack(TTrack assoc)
{
if (assoc.eta() > assocEtaMax || assoc.eta() < assocEtaMin) {
return false;
}
if (assoc.pt() > assocPtCutMax || assoc.pt() < assocPtCutMin) {
return false;
}
if (assoc.tpcNClsCrossedRows() < minTPCNCrossedRows) {
return false; // crossed rows
}
if (!assoc.hasITS() && assocRequireITS) {
return false; // skip, doesn't have ITS signal (skips lots of TPC-only!)
}

// do this only if information is available
float nSigmaTPCTOF[8] = {-10, -10, -10, -10, -10, -10, -10, -10};
if constexpr (requires { assoc.tofSignal(); }) {
if (assoc.tofSignal() > 0) {
if (std::sqrt(assoc.tofNSigmaPi() * assoc.tofNSigmaPi() + assoc.tpcNSigmaPi() * assoc.tpcNSigmaPi()) > assocPionNSigmaTPCFOF)
return false;
if (assoc.tofNSigmaPr() < rejectSigma)
return false;
if (assoc.tpcNSigmaPr() < rejectSigma)
return false;
if (assoc.tofNSigmaKa() < rejectSigma)
return false;
if (assoc.tpcNSigmaKa() < rejectSigma)
return false;
nSigmaTPCTOF[4] = assoc.tofNSigmaPi();
nSigmaTPCTOF[5] = assoc.tofNSigmaKa();
nSigmaTPCTOF[6] = assoc.tofNSigmaPr();
nSigmaTPCTOF[7] = assoc.tofNSigmaEl();
} else {
if (assoc.tpcNSigmaPi() > assocPionNSigmaTPCFOF)
return false;
if (assoc.tpcNSigmaPr() < rejectSigma)
return false;
if (assoc.tpcNSigmaKa() < rejectSigma)
return false;
}
nSigmaTPCTOF[0] = assoc.tpcNSigmaPi();
nSigmaTPCTOF[1] = assoc.tpcNSigmaKa();
nSigmaTPCTOF[2] = assoc.tpcNSigmaPr();
nSigmaTPCTOF[3] = assoc.tpcNSigmaEl();
}

bool physicalPrimary = false;
float origPt = -1;
if constexpr (requires { assoc.mcParticle(); }) {
if (assoc.has_mcParticle()) {
auto mcParticle = assoc.mcParticle();
physicalPrimary = mcParticle.isPhysicalPrimary();
origPt = mcParticle.pt();
}
}

assocHadrons(
assoc.collisionId(),
physicalPrimary,
assoc.globalIndex(),
origPt);
assocPID(
nSigmaTPCTOF[0],
nSigmaTPCTOF[1],
nSigmaTPCTOF[2],
nSigmaTPCTOF[3],
nSigmaTPCTOF[4],
nSigmaTPCTOF[5],
nSigmaTPCTOF[6],
nSigmaTPCTOF[7]);
return true;
}

// for real data processing
void processTriggers(soa::Join<aod::Collisions, aod::EvSels>::iterator const& collision, soa::Filtered<DauTracks> const& tracks, aod::BCsWithTimestamps const&)
void processTriggers(soa::Join<aod::Collisions, aod::EvSels>::iterator const& collision, soa::Filtered<FullTracks> const& tracks, aod::BCsWithTimestamps const&)
{
// Perform basic event selection
if (!collision.sel8()) {
Expand Down Expand Up @@ -252,11 +331,12 @@ struct hstrangecorrelationfilter {
false, // if you decide to check real data for primaries, you'll have a hard time
track.globalIndex(),
0);
triggerTrackExtra(1);
}
}

// for MC processing
void processTriggersMC(soa::Join<aod::Collisions, aod::EvSels>::iterator const& collision, soa::Filtered<DauTracksMC> const& tracks, aod::McParticles const&, aod::BCsWithTimestamps const&)
void processTriggersMC(soa::Join<aod::Collisions, aod::EvSels>::iterator const& collision, soa::Filtered<FullTracksMC> const& tracks, aod::McParticles const&, aod::BCsWithTimestamps const&)
{
// Perform basic event selection
if (!collision.sel8()) {
Expand Down Expand Up @@ -292,6 +372,7 @@ struct hstrangecorrelationfilter {
physicalPrimary,
track.globalIndex(),
origPt);
triggerTrackExtra(1);
}
}

Expand All @@ -317,59 +398,12 @@ struct hstrangecorrelationfilter {
/// _________________________________________________
/// Step 1: Populate table with trigger tracks
for (auto const& track : tracks) {
if (track.eta() > assocEtaMax || track.eta() < assocEtaMin) {
if (!isValidAssocTrack(track))
continue;
}
// if (track.sign()= 1 ) {continue;}
if (track.pt() > assocPtCutMax || track.pt() < assocPtCutMin) {
continue;
}
if (track.tpcNClsCrossedRows() < minTPCNCrossedRows) {
continue; // crossed rows
}
if (!track.hasITS() && triggerRequireITS) {
continue; // skip, doesn't have ITS signal (skips lots of TPC-only!)
}
// prepared for Bayesian PID
// if (!track.bayesPi() > pionMinBayesProb) {
// continue;
// }
// if (track.bayesPi() < track.bayesPr() || track.bayesPi() < track.bayesKa()){
// continue;
// }
// if (track.tpcNSigmaPi() < assocPionNSigmaTPCFOF){
// continue;
// }
// if (track.tofSignal() > 0 && track.tofNSigmaPi() < assocPionNSigmaTPCFOF){
// continue;
// }
if (track.tofSignal() > 0) {
if (std::sqrt(track.tofNSigmaPi() * track.tofNSigmaPi() + track.tpcNSigmaPi() * track.tpcNSigmaPi()) > assocPionNSigmaTPCFOF)
continue;
if (track.tofNSigmaPr() < rejectSigma)
continue;
if (track.tpcNSigmaPr() < rejectSigma)
continue;
if (track.tofNSigmaKa() < rejectSigma)
continue;
if (track.tpcNSigmaKa() < rejectSigma)
continue;
} else {
if (track.tpcNSigmaPi() > assocPionNSigmaTPCFOF)
continue;
if (track.tpcNSigmaPr() < rejectSigma)
continue;
if (track.tpcNSigmaKa() < rejectSigma)
continue;
}

assocHadrons(
track.collisionId(),
track.globalIndex());
}
}

void processAssocHadrons(soa::Join<aod::Collisions, aod::EvSels>::iterator const& collision, soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA>> const& tracks, aod::BCsWithTimestamps const&)
void processAssocPionsMC(soa::Join<aod::Collisions, aod::EvSels>::iterator const& collision, soa::Filtered<IDTracksMC> const& tracks, aod::BCsWithTimestamps const&)
{
// Perform basic event selection
if (!collision.sel8()) {
Expand All @@ -391,23 +425,61 @@ struct hstrangecorrelationfilter {
/// _________________________________________________
/// Step 1: Populate table with trigger tracks
for (auto const& track : tracks) {
if (track.eta() > assocEtaMax || track.eta() < assocEtaMin) {
if (!isValidAssocTrack(track))
continue;
}
}

void processAssocHadrons(soa::Join<aod::Collisions, aod::EvSels>::iterator const& collision, soa::Filtered<FullTracks> const& tracks, aod::BCsWithTimestamps const&)
{
// Perform basic event selection
if (!collision.sel8()) {
return;
}
// No need to correlate stuff that's in far collisions
if (TMath::Abs(collision.posZ()) > 10.0) {
return;
}
if (zorroMask.value != "") {
auto bc = collision.bc_as<aod::BCsWithTimestamps>();
initCCDB(bc);
bool zorroSelected = zorro.isSelected(collision.bc_as<aod::BCsWithTimestamps>().globalBC()); /// Just let Zorro do the accounting
if (!zorroSelected) {
return;
}
// if (track.sign()= 1 ) {continue;}
if (track.pt() > assocPtCutMax || track.pt() < assocPtCutMin) {
}

/// _________________________________________________
/// Step 1: Populate table with trigger tracks
for (auto const& track : tracks) {
if (!isValidAssocTrack(track))
continue;
}
}
void processAssocHadronsMC(soa::Join<aod::Collisions, aod::EvSels>::iterator const& collision, soa::Filtered<FullTracksMC> const& tracks, aod::BCsWithTimestamps const&)
{
// Perform basic event selection
if (!collision.sel8()) {
return;
}
// No need to correlate stuff that's in far collisions
if (TMath::Abs(collision.posZ()) > 10.0) {
return;
}
if (zorroMask.value != "") {
auto bc = collision.bc_as<aod::BCsWithTimestamps>();
initCCDB(bc);
bool zorroSelected = zorro.isSelected(collision.bc_as<aod::BCsWithTimestamps>().globalBC()); /// Just let Zorro do the accounting
if (!zorroSelected) {
return;
}
if (track.tpcNClsCrossedRows() < minTPCNCrossedRows) {
continue; // crossed rows
}
if (!track.hasITS() && triggerRequireITS) {
continue; // skip, doesn't have ITS signal (skips lots of TPC-only!)
}
}

assocHadrons(
track.collisionId(),
track.globalIndex());
/// _________________________________________________
/// Step 1: Populate table with trigger tracks
for (auto const& track : tracks) {
if (!isValidAssocTrack(track))
continue;
}
}

Expand Down Expand Up @@ -600,9 +672,11 @@ struct hstrangecorrelationfilter {
PROCESS_SWITCH(hstrangecorrelationfilter, processTriggers, "Produce trigger tables", true);
PROCESS_SWITCH(hstrangecorrelationfilter, processTriggersMC, "Produce trigger tables for MC", false);
PROCESS_SWITCH(hstrangecorrelationfilter, processV0s, "Produce associated V0 tables", true);
PROCESS_SWITCH(hstrangecorrelationfilter, processAssocPions, "Produce associated Pion tables", true);
PROCESS_SWITCH(hstrangecorrelationfilter, processAssocPions, "Produce associated Pion tables", false);
PROCESS_SWITCH(hstrangecorrelationfilter, processAssocPionsMC, "Produce associated Pion tables for MC", false);
PROCESS_SWITCH(hstrangecorrelationfilter, processCascades, "Produce associated cascade tables", true);
PROCESS_SWITCH(hstrangecorrelationfilter, processAssocHadrons, "Produce associated Hadron tables", true);
PROCESS_SWITCH(hstrangecorrelationfilter, processAssocHadronsMC, "Produce associated Hadron tables for MC", false);
};

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
Expand Down
Loading
Loading