Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/Reduced3BodyTables.h
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/Reduced3BodyTables.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 @@ -8,7 +8,7 @@
// In applying this license CERN does not waive the privileges and immunities
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

Check warning on line 11 in PWGLF/DataModel/Reduced3BodyTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Documentation for \file is missing, incorrect or misplaced.

Check warning on line 11 in PWGLF/DataModel/Reduced3BodyTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Documentation for \brief is missing, incorrect or misplaced.

Check warning on line 11 in PWGLF/DataModel/Reduced3BodyTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Documentation for \author is missing, incorrect or misplaced.
#ifndef PWGLF_DATAMODEL_REDUCED3BODYTABLES_H_
#define PWGLF_DATAMODEL_REDUCED3BODYTABLES_H_

Expand Down Expand Up @@ -47,8 +47,8 @@
DECLARE_SOA_COLUMN(Tgl, tgl, float); //!
DECLARE_SOA_COLUMN(Signed1Pt, signed1Pt, float); //! (sign of charge)/Pt in c/GeV. Use pt() and sign() instead
DECLARE_SOA_EXPRESSION_COLUMN(Phi, phi, float, //! Phi of the track, in radians within [0, 2pi)
ifnode(nasin(aod::track::snp) + aod::track::alpha < 0.0f, nasin(aod::track::snp) + aod::track::alpha + o2::constants::math::TwoPI,

Check warning on line 50 in PWGLF/DataModel/Reduced3BodyTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[two-pi-add-subtract]

Consider using RecoDecay::constrainAngle to restrict angle to a given range.
ifnode(nasin(aod::track::snp) + aod::track::alpha >= o2::constants::math::TwoPI, nasin(aod::track::snp) + aod::track::alpha - o2::constants::math::TwoPI,

Check warning on line 51 in PWGLF/DataModel/Reduced3BodyTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[two-pi-add-subtract]

Consider using RecoDecay::constrainAngle to restrict angle to a given range.
nasin(aod::track::snp) + aod::track::alpha)));
DECLARE_SOA_EXPRESSION_COLUMN(Eta, eta, float, //! Pseudorapidity
-1.f * nlog(ntan(o2::constants::math::PIQuarter - 0.5f * natan(aod::track::tgl))));
Expand Down Expand Up @@ -137,11 +137,11 @@
aod::track::sigma1Pt* aod::track::sigma1Pt);

// tracks extra parameter definition
DECLARE_SOA_COLUMN(TPCInnerParam, tpcInnerParam, float); //! Momentum at inner wall of the TPC

Check warning on line 140 in PWGLF/DataModel/Reduced3BodyTables.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(Flags, flags, uint32_t); //! Track flags. Run 2: see TrackFlagsRun2Enum | Run 3: see TrackFlags
DECLARE_SOA_COLUMN(ITSClusterSizes, itsClusterSizes, uint32_t); //! Clusters sizes, four bits per a layer, starting from the innermost

Check warning on line 142 in PWGLF/DataModel/Reduced3BodyTables.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(TPCNClsFindable, tpcNClsFindable, uint8_t); //! Findable TPC clusters for this track geometry

Check warning on line 143 in PWGLF/DataModel/Reduced3BodyTables.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(TPCNClsFindableMinusFound, tpcNClsFindableMinusFound, int8_t); //! TPC Clusters: Findable - Found

Check warning on line 144 in PWGLF/DataModel/Reduced3BodyTables.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(TPCNClsFindableMinusCrossedRows, tpcNClsFindableMinusCrossedRows, int8_t); //! TPC Clusters: Findable - crossed rows
DECLARE_SOA_COLUMN(TRDPattern, trdPattern, uint8_t); //! Contributor to the track on TRD layer in bits 0-5, starting from the innermost, bit 6 indicates a potentially split tracklet, bit 7 if the track crossed a padrow
DECLARE_SOA_COLUMN(TPCChi2NCl, tpcChi2NCl, float); //! Chi2 / cluster for the TPC track segment
Expand Down Expand Up @@ -266,4 +266,4 @@

} // namespace o2::aod

#endif // PWGLF_DATAMODEL_REDUCED3BODYTABLES_H_
#endif // PWGLF_DATAMODEL_REDUCED3BODYTABLES_H_
5 changes: 2 additions & 3 deletions PWGLF/DataModel/pidTOFGeneric.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ template <typename TTrack>
template <typename TCollision>
float TofPidNewCollision<TTrack>::GetTOFNSigma(o2::track::PID::ID pidId, TTrack const& track, TCollision const& originalcol, TCollision const& correctedcol, bool EnableBCAO2D)
{

if (!track.has_collision() || !track.hasTOF()) {
return -999;
}
Expand Down Expand Up @@ -190,7 +190,7 @@ float TofPidNewCollision<TTrack>::GetTOFNSigma(TTrack const& track, TCollision c
}

template <typename TTrack>
float TofPidNewCollision<TTrack>::GetTOFNSigma(o2::track::PID::ID pidId, TTrack const& track)
float TofPidNewCollision<TTrack>::GetTOFNSigma(o2::track::PID::ID pidId, TTrack const& track)
{

if (!track.has_collision() || !track.hasTOF()) {
Expand All @@ -214,7 +214,6 @@ float TofPidNewCollision<TTrack>::GetTOFNSigma(TTrack const& track)
return GetTOFNSigma(pidType, track);
}


} // namespace pidtofgeneric
} // namespace o2::aod

Expand Down
Loading