diff --git a/PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h b/PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h index d5367f6fbe5..72dc30617fd 100644 --- a/PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h +++ b/PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h @@ -93,15 +93,15 @@ DECLARE_SOA_TABLE(HfcRedCharmTrigs, "AOD", "HFCREDCHARMTRIG", //! Table with cha 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 +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(NTpcCrossedRowsTrig, nTpcCrossedRowsTrig, UChar_t); //! Number of crossed TPC Rows DECLARE_SOA_COLUMN(ItsClusterMapTrig, itsClusterMapTrig, UChar_t); //! ITS cluster map, one bit per a layer, starting from the innermost DECLARE_SOA_COLUMN(ItsNClsTrig, itsNClsTrig, UChar_t); //! Number of ITS clusters diff --git a/PWGHF/HFC/TableProducer/correlatorFlowCharmHadronsReduced.cxx b/PWGHF/HFC/TableProducer/correlatorFlowCharmHadronsReduced.cxx index 70dac06e48b..b8eac589d1f 100644 --- a/PWGHF/HFC/TableProducer/correlatorFlowCharmHadronsReduced.cxx +++ b/PWGHF/HFC/TableProducer/correlatorFlowCharmHadronsReduced.cxx @@ -393,7 +393,7 @@ struct HfCorrelatorFlowCharmHadronsReduced { } if (downSamplePairsME < 1.) { float pseudoRndm = getPt(assocTrack) * 1000. - static_cast(getPt(assocTrack) * 1000); - if (getPt(trigCand) < ptMaxForDownSampleME && trigColl.centrality() < centMaxForDownSampleME && + if (getPt(trigCand) < ptMaxForDownSampleME && trigColl.centrality() < centMaxForDownSampleME && assocColl.centrality() < centMaxForDownSampleME && pseudoRndm >= downSamplePairsME) { continue; } diff --git a/PWGHF/HFC/TableProducer/derivedDataCreatorCorrelationsReduced.cxx b/PWGHF/HFC/TableProducer/derivedDataCreatorCorrelationsReduced.cxx index e43bae8dcfb..fa8da654e0e 100644 --- a/PWGHF/HFC/TableProducer/derivedDataCreatorCorrelationsReduced.cxx +++ b/PWGHF/HFC/TableProducer/derivedDataCreatorCorrelationsReduced.cxx @@ -307,9 +307,9 @@ struct HfDerivedDataCreatorCorrelationsReduced { template 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()); } } @@ -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()); } }