Skip to content

[PWGLF] Please consider the following formatting changes to #9234 #29

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
fmazzasc merged 1 commit into from
Jan 8, 2025
Merged

[PWGLF] Please consider the following formatting changes to #9234 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion PWGLF/DataModel/LFKinkDecayTables.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/LFKinkDecayTables.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 LFKinkDecayTables.h
/// \brief Slim tables for kinks
///

Check warning on line 15 in PWGLF/DataModel/LFKinkDecayTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \author is missing, incorrect or misplaced.

#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoAHelpers.h"
Expand All @@ -29,7 +29,7 @@

DECLARE_SOA_INDEX_COLUMN_FULL(TrackMoth, trackMoth, int, TracksIU, "_Moth"); //!
DECLARE_SOA_INDEX_COLUMN_FULL(TrackDaug, trackDaug, int, TracksIU, "_Daug"); //!
DECLARE_SOA_INDEX_COLUMN(Collision, collision); //!
DECLARE_SOA_INDEX_COLUMN(Collision, collision); //!

DECLARE_SOA_COLUMN(XDecVtx, xDecVtx, float); //! Decay vertex of the candidate (x direction)
DECLARE_SOA_COLUMN(YDecVtx, yDecVtx, float); //! Decay vertex of the candidate (y direction)
Expand All @@ -40,20 +40,20 @@
DECLARE_SOA_COLUMN(PxDaug, pxDaug, float); //! Px of the daughter kink
DECLARE_SOA_COLUMN(PyDaug, pyDaug, float); //! Py of the daughter kink
DECLARE_SOA_COLUMN(PzDaug, pzDaug, float); //! Pz of the daughter kink
DECLARE_SOA_COLUMN(MotherSign, mothSign, int); //! Sign of the mother kink

Check warning on line 43 in PWGLF/DataModel/LFKinkDecayTables.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(DcaMothPv, dcaMothPv, float); //! DCA of the mother to the primary vertex
DECLARE_SOA_COLUMN(DcaDaugPv, dcaDaugPv, float); //! DCA of the daughter kink to the primary vertex
DECLARE_SOA_COLUMN(DCAKinkTopo, dcaKinkTopo, float); //! DCA of the kink topology

Check warning on line 46 in PWGLF/DataModel/LFKinkDecayTables.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.

// DYNAMIC COLUMNS

DECLARE_SOA_DYNAMIC_COLUMN(PxDauNeut, pxDaugNeut, //! Px of the daughter neutral particle

Check warning on line 50 in PWGLF/DataModel/LFKinkDecayTables.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.
[](float pxmoth, float pxdau) -> float { return pxmoth - pxdau; });

DECLARE_SOA_DYNAMIC_COLUMN(PyDauNeut, pyDaugNeut, //! Py of the daughter neutral particle

Check warning on line 53 in PWGLF/DataModel/LFKinkDecayTables.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.
[](float pymoth, float pydau) -> float { return pymoth - pydau; });

DECLARE_SOA_DYNAMIC_COLUMN(PzDauNeut, pzDaugNeut, //! Pz of the daughter neutral particle

Check warning on line 56 in PWGLF/DataModel/LFKinkDecayTables.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.
[](float pzmoth, float pzdau) -> float { return pzmoth - pzdau; });

DECLARE_SOA_DYNAMIC_COLUMN(PtMoth, ptMoth, //! pT of the mother kink
Expand Down
5 changes: 2 additions & 3 deletions PWGLF/TableProducer/Common/kinkBuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.
//
/// \brief Builder task for kink decay topologies using ITS standalone tracks for the mother
/// \brief Builder task for kink decay topologies using ITS standalone tracks for the mother
/// \author Francesco Mazzaschi <francesco.mazzaschi@cern.ch>

#include <array>
Expand Down Expand Up @@ -102,7 +102,7 @@
o2::base::MatLayerCylSet* lut = nullptr;

// constants
float radToDeg = 180. / M_PI;

Check warning on line 105 in PWGLF/TableProducer/Common/kinkBuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[external-pi] 

Consider using the PI constant (and its multiples and fractions) defined in o2::constants::math.
svPoolCreator svCreator;

// bethe bloch parameters
Expand Down Expand Up @@ -220,7 +220,7 @@
svCreator.clearPools();
svCreator.fillBC2Coll(collisions, bcs);

for (auto& track : tracks) {

Check warning on line 223 in PWGLF/TableProducer/Common/kinkBuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (std::abs(track.eta()) > etaMax)
continue;

Expand All @@ -235,7 +235,7 @@
}
auto& kinkPool = svCreator.getSVCandPool(collisions, !unlikeSignBkg);

for (auto& svCand : kinkPool) {

Check warning on line 238 in PWGLF/TableProducer/Common/kinkBuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
kinkCandidate kinkCand;

auto trackMoth = tracks.rawIteratorAt(svCand.tr0Idx);
Expand Down Expand Up @@ -412,11 +412,10 @@
void process(aod::Collisions const& collisions, TracksFull const& tracks, aod::AmbiguousTracks const& ambiTracks, aod::BCsWithTimestamps const& bcs)
{


kinkCandidates.clear();
fillCandidateData(collisions, tracks, ambiTracks, bcs);

//sort kinkCandidates by collisionID to allow joining with collision table
// sort kinkCandidates by collisionID to allow joining with collision table
std::sort(kinkCandidates.begin(), kinkCandidates.end(), [](const kinkCandidate& a, const kinkCandidate& b) { return a.collisionID < b.collisionID; });

for (auto& kinkCand : kinkCandidates) {
Expand Down
Loading