Skip to content

[PWGHF] Please consider the following formatting changes to #12989 #38

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
Marcellocosti merged 1 commit into from
Sep 15, 2025
Merged

[PWGHF] Please consider the following formatting changes to #12989 #38

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
18 changes: 9 additions & 9 deletions PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,18 @@

namespace hf_assoc_track_reduced
{
DECLARE_SOA_COLUMN(OriginTrackId, originTrackId, int); //! Original track index
DECLARE_SOA_COLUMN(NTpcCrossedRows, nTpcCrossedRows, UChar_t); //! Number of crossed TPC Rows
DECLARE_SOA_COLUMN(ItsClusterMap, itsClusterMap, UChar_t); //! ITS cluster map, one bit per a layer, starting from the innermost
DECLARE_SOA_COLUMN(ItsNCls, itsNCls, UChar_t); //! Number of ITS clusters
DECLARE_SOA_COLUMN(EtaAssocTrack, etaAssocTrack, float); //! Eta of the track
DECLARE_SOA_COLUMN(PhiAssocTrack, phiAssocTrack, float); //! Phi of the track
DECLARE_SOA_COLUMN(PtAssocTrack, ptAssocTrack, float); //! Pt of the track
DECLARE_SOA_COLUMN(DcaXY, dcaXY, float); //! Impact parameter in XY of the track to the primary vertex
DECLARE_SOA_COLUMN(DcaZ, dcaZ, float); //! Impact parameter in Z of the track to the primary vertex
DECLARE_SOA_COLUMN(OriginTrackId, originTrackId, int); //! Original track index
DECLARE_SOA_COLUMN(NTpcCrossedRows, nTpcCrossedRows, UChar_t); //! Number of crossed TPC Rows

Check failure on line 97 in PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity] 

Replace ROOT entities with equivalents from standard C++ or from O2.
DECLARE_SOA_COLUMN(ItsClusterMap, itsClusterMap, UChar_t); //! ITS cluster map, one bit per a layer, starting from the innermost

Check failure on line 98 in PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity] 

Replace ROOT entities with equivalents from standard C++ or from O2.
DECLARE_SOA_COLUMN(ItsNCls, itsNCls, UChar_t); //! Number of ITS clusters

Check failure on line 99 in PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity] 

Replace ROOT entities with equivalents from standard C++ or from O2.
DECLARE_SOA_COLUMN(EtaAssocTrack, etaAssocTrack, float); //! Eta of the track
DECLARE_SOA_COLUMN(PhiAssocTrack, phiAssocTrack, float); //! Phi of the track
DECLARE_SOA_COLUMN(PtAssocTrack, ptAssocTrack, float); //! Pt of the track
DECLARE_SOA_COLUMN(DcaXY, dcaXY, float); //! Impact parameter in XY of the track to the primary vertex
DECLARE_SOA_COLUMN(DcaZ, dcaZ, float); //! Impact parameter in Z of the track to the primary vertex
DECLARE_SOA_COLUMN(NTpcCrossedRowsTrig, nTpcCrossedRowsTrig, UChar_t); //! Number of crossed TPC Rows

Check failure on line 105 in PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity] 

Replace ROOT entities with equivalents from standard C++ or from O2.
DECLARE_SOA_COLUMN(ItsClusterMapTrig, itsClusterMapTrig, UChar_t); //! ITS cluster map, one bit per a layer, starting from the innermost

Check failure on line 106 in PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity] 

Replace ROOT entities with equivalents from standard C++ or from O2.
DECLARE_SOA_COLUMN(ItsNClsTrig, itsNClsTrig, UChar_t); //! Number of ITS clusters

Check failure on line 107 in PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity] 

Replace ROOT entities with equivalents from standard C++ or from O2.
DECLARE_SOA_COLUMN(EtaAssocTrackTrig, etaAssocTrackTrig, float); //! Eta of the track
DECLARE_SOA_COLUMN(PhiAssocTrackTrig, phiAssocTrackTrig, float); //! Phi of the track
DECLARE_SOA_COLUMN(PtAssocTrackTrig, ptAssocTrackTrig, float); //! Pt of the track
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/HFC/TableProducer/correlatorFlowCharmHadronsReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ struct HfCorrelatorFlowCharmHadronsReduced {
}
if (downSamplePairsME < 1.) {
float pseudoRndm = getPt(assocTrack) * 1000. - static_cast<int64_t>(getPt(assocTrack) * 1000);
if (getPt(trigCand) < ptMaxForDownSampleME && trigColl.centrality() < centMaxForDownSampleME &&
if (getPt(trigCand) < ptMaxForDownSampleME && trigColl.centrality() < centMaxForDownSampleME &&
assocColl.centrality() < centMaxForDownSampleME && pseudoRndm >= downSamplePairsME) {
continue;
}
Expand Down
8 changes: 4 additions & 4 deletions PWGHF/HFC/TableProducer/derivedDataCreatorCorrelationsReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,9 +307,9 @@ struct HfDerivedDataCreatorCorrelationsReduced {
template <typename TCand, typename TTrack>
bool checkDaughterTrack(TTrack const& track, TCand const& cand)
{
if constexpr ((requires { cand.prong2Id(); })) { // Check 3-prong
if constexpr ((requires { cand.prong2Id(); })) { // Check 3-prong
return (track.globalIndex() == cand.prong0Id() || track.globalIndex() == cand.prong1Id() || track.globalIndex() == cand.prong2Id());
} else { // Check 2-prong
} else { // Check 2-prong
return (track.globalIndex() == cand.prong0Id() || track.globalIndex() == cand.prong1Id());
}
}
Expand Down Expand Up @@ -441,8 +441,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
registry.fill(HIST("hPoolBinAssoc"), poolBin);
registry.fill(HIST("hPhiVsPtAssoc"), RecoDecay::constrainAngle(assTrk.phi(), -o2::constants::math::PIHalf), assTrk.pt());
registry.fill(HIST("hEtaVsPtAssoc"), assTrk.eta(), assTrk.pt());
rowAssocTrackReduced(rowCollisions.lastIndex(), assTrk.phi(), assTrk.eta(),
assTrk.pt(), assTrk.tpcNClsCrossedRows(), assTrk.itsClusterMap(),
rowAssocTrackReduced(rowCollisions.lastIndex(), assTrk.phi(), assTrk.eta(),
assTrk.pt(), assTrk.tpcNClsCrossedRows(), assTrk.itsClusterMap(),
assTrk.itsNCls(), assTrk.dcaXY(), assTrk.dcaZ());
}
}
Expand Down
Loading