Skip to content

[PWGLF] Update type alias in lambda1520_PbPb.cxx #9544

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
njacazio merged 3 commits into from
Jan 27, 2025
Merged

[PWGLF] Update type alias in lambda1520_PbPb.cxx #9544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55e95cb
Modify table issue
BongHwi Jan 27, 2025
da59512
Add dedicated index column for DFs
BongHwi Jan 27, 2025
d1e658e
fix index issue
BongHwi Jan 27, 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
3 changes: 2 additions & 1 deletion PWGLF/DataModel/LFResonanceTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
{

DECLARE_SOA_INDEX_COLUMN(ResoCollision, resoCollision);
DECLARE_SOA_INDEX_COLUMN(ResoCollisionDF, resoCollisionDF);
DECLARE_SOA_INDEX_COLUMN_FULL(Track, track, int, Tracks, "_Trk"); //!
DECLARE_SOA_INDEX_COLUMN_FULL(V0, v0, int, V0s, "_V0"); //!
DECLARE_SOA_INDEX_COLUMN_FULL(Cascade, cascade, int, Cascades, "_Cas"); //!
Expand All @@ -154,9 +155,9 @@
DECLARE_SOA_COLUMN(Indices, indices, int[2]); //! Field for the track indices to remove auto-correlations
DECLARE_SOA_COLUMN(CascadeIndices, cascadeIndices, int[3]); //! Field for the track indices to remove auto-correlations (ordered: positive, negative, bachelor)
DECLARE_SOA_COLUMN(Sign, sign, int8_t); //! Sign of the track charge
DECLARE_SOA_COLUMN(TPCNClsCrossedRows, tpcNClsCrossedRows, uint8_t); //! Number of TPC crossed rows

Check warning on line 158 in PWGLF/DataModel/LFResonanceTables.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(TPCNClsFound, tpcNClsFound, uint8_t); //! Number of TPC clusters found

Check warning on line 159 in PWGLF/DataModel/LFResonanceTables.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(ITSNCls, itsNCls, uint8_t); //! Number of ITS clusters found

Check warning on line 160 in PWGLF/DataModel/LFResonanceTables.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(IsGlobalTrackWoDCA, isGlobalTrackWoDCA, bool); //! Is global track without DCA
DECLARE_SOA_COLUMN(IsGlobalTrack, isGlobalTrack, bool); //! Is global track
DECLARE_SOA_COLUMN(IsPrimaryTrack, isPrimaryTrack, bool); //! Is primary track
Expand All @@ -164,7 +165,7 @@
DECLARE_SOA_COLUMN(HasITS, hasITS, bool); //! Has ITS
DECLARE_SOA_COLUMN(HasTPC, hasTPC, bool); //! Has TPC
DECLARE_SOA_COLUMN(HasTOF, hasTOF, bool); //! Has TOF
DECLARE_SOA_COLUMN(TPCCrossedRowsOverFindableCls, tpcCrossedRowsOverFindableCls, float);

Check warning on line 168 in PWGLF/DataModel/LFResonanceTables.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(DaughDCA, daughDCA, float); //! DCA between daughters
DECLARE_SOA_COLUMN(CascDaughDCA, cascDaughDCA, float); //! DCA between daughters from cascade
DECLARE_SOA_COLUMN(V0CosPA, v0CosPA, float); //! V0 Cosine of Pointing Angle
Expand Down Expand Up @@ -254,7 +255,7 @@
// For DF mixing study
DECLARE_SOA_TABLE(ResoTrackDFs, "AOD", "RESOTRACKDFs",
o2::soa::Index<>,
resodaughter::ResoCollisionId,
resodaughter::ResoCollisionDFId,
resodaughter::TrackId,
resodaughter::Pt,
resodaughter::Px,
Expand Down
4 changes: 2 additions & 2 deletions PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,8 @@
auto _pyKa = trkKa.py();
auto _pzKa = trkKa.pz();

p_ptot = TMath::Sqrt(_pxPr * _pxPr + _pyPr * _pyPr + _pzPr * _pzPr);

Check warning on line 393 in PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity] 

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
k_ptot = TMath::Sqrt(_pxKa * _pxKa + _pyKa * _pyKa + _pzKa * _pzKa);

Check warning on line 394 in PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity] 

Consider replacing ROOT entities with equivalents from standard C++ or from O2.

// Fill QA before track selection.
if (!mix) {
Expand Down Expand Up @@ -601,19 +601,19 @@
}

for (auto const& part : resoParents) {
if (abs(part.pdgCode()) != lambda1520id) // // L* pdg_code = 3124

Check warning on line 604 in PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
continue;
if (abs(part.y()) > 0.5) { // rapidity cut

Check warning on line 606 in PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
continue;
}

bool pass1 = false;
bool pass2 = false;

if (abs(part.daughterPDG1()) == 2212 || abs(part.daughterPDG2()) == 2212) { // At least one decay to Proton

Check warning on line 613 in PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
pass1 = true;
}
if (abs(part.daughterPDG1()) == 321 || abs(part.daughterPDG2()) == 321) { // At least one decay to Kaon

Check warning on line 616 in PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
pass2 = true;
}

Expand Down Expand Up @@ -653,9 +653,9 @@

PROCESS_SWITCH(lambdaAnalysis_pb, processMix, "Process for Mixed Events", false);

Preslice<aod::ResoTrackDFs> perRColdf = aod::resodaughter::resoCollisionId;
Preslice<aod::ResoTrackDFs> perRColdf = aod::resodaughter::resoCollisionDFId;

using resoColDFs = aod::ResoCollisions;
using resoColDFs = aod::ResoCollisionDFs;
using resoTrackDFs = aod::ResoTrackDFs;

void processDatadf(resoColDFs::iterator const& collision, resoTrackDFs const& tracks)
Expand Down
Loading