Skip to content

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

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 17, 2025
Merged

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

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
52 changes: 26 additions & 26 deletions PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,32 +106,32 @@ DECLARE_SOA_TABLE(AssocTrackSels, "AOD", "ASSOCTRACKSEL", //! Table with associa
// definition of columns and tables for Charm-Hadron and Hadron-Hadron correlation pairs
namespace hf_correl_charm_had_reduced
{
DECLARE_SOA_INDEX_COLUMN(HfcRedCorrColl, hfcRedCorrColl); //! ReducedCollision index
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float); //! DeltaPhi between charm hadron and Hadrons
DECLARE_SOA_COLUMN(DeltaEta, deltaEta, float); //! DeltaEta between charm hadron and Hadrons
DECLARE_SOA_COLUMN(PoolBin, poolBin, int); //! Pool Bin for the MixedEvent
DECLARE_SOA_COLUMN(PhiTrig, phiTrig, float); //! Phi of the trigger candidate
DECLARE_SOA_COLUMN(EtaTrig, etaTrig, float); //! Eta of the trigger candidate
DECLARE_SOA_COLUMN(PtTrig, ptTrig, float); //! Pt of the trigger candidate
DECLARE_SOA_COLUMN(InvMassTrig, invMassTrig, float); //! Invariant mass of Charm trigger candidate
DECLARE_SOA_COLUMN(BdtScore0Trig, bdtScore0Trig, float); //! First BDT output score
DECLARE_SOA_COLUMN(BdtScore1Trig, bdtScore1Trig, float); //! Second BDT output score
DECLARE_SOA_COLUMN(NTpcCrossedRowsTrig, nTpcCrossedRowsTrig, int); //! Number of crossed TPC Rows
DECLARE_SOA_COLUMN(ItsClsMapTrig, itsClsMapTrig, int); //! ITS cluster map, one bit per a layer, starting from the innermost
DECLARE_SOA_COLUMN(ItsNClsTrig, itsNClsTrig, int); //! Number of ITS clusters
DECLARE_SOA_COLUMN(EtaTrigTrack, etaTrigTrack, float); //! Eta of the track
DECLARE_SOA_COLUMN(PhiTrigTrack, phiTrigTrack, float); //! Phi of the track
DECLARE_SOA_COLUMN(PtTrigTrack, ptTrigTrack, float); //! Pt of the track
DECLARE_SOA_COLUMN(DcaXYTrig, dcaXYTrig, float); //! Impact parameter in XY of the track to the primary vertex
DECLARE_SOA_COLUMN(DcaZTrig, dcaZTrig, float); //! Impact parameter in Z of the track to the primary vertex
DECLARE_SOA_COLUMN(NTpcCrossedRowsAssoc, nTpcCrossedRowsAssoc, int); //! Number of crossed TPC Rows
DECLARE_SOA_COLUMN(ItsClsMapAssoc, itsClsMapAssoc, int); //! ITS cluster map, one bit per a layer, starting from the innermost
DECLARE_SOA_COLUMN(ItsNClsAssoc, itsNClsAssoc, int); //! Number of ITS clusters
DECLARE_SOA_COLUMN(EtaAssoc, etaAssoc, float); //! Eta of the track
DECLARE_SOA_COLUMN(PhiAssoc, phiAssoc, float); //! Phi of the track
DECLARE_SOA_COLUMN(PtAssoc, ptAssoc, float); //! Pt of the track
DECLARE_SOA_COLUMN(DcaXYAssoc, dcaXYAssoc, float); //! Impact parameter in XY of the track to the primary vertex
DECLARE_SOA_COLUMN(DcaZAssoc, dcaZAssoc, float); //! Impact parameter in Z of the track to the primary vertex
DECLARE_SOA_INDEX_COLUMN(HfcRedCorrColl, hfcRedCorrColl); //! ReducedCollision index
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float); //! DeltaPhi between charm hadron and Hadrons
DECLARE_SOA_COLUMN(DeltaEta, deltaEta, float); //! DeltaEta between charm hadron and Hadrons
DECLARE_SOA_COLUMN(PoolBin, poolBin, int); //! Pool Bin for the MixedEvent
DECLARE_SOA_COLUMN(PhiTrig, phiTrig, float); //! Phi of the trigger candidate
DECLARE_SOA_COLUMN(EtaTrig, etaTrig, float); //! Eta of the trigger candidate
DECLARE_SOA_COLUMN(PtTrig, ptTrig, float); //! Pt of the trigger candidate
DECLARE_SOA_COLUMN(InvMassTrig, invMassTrig, float); //! Invariant mass of Charm trigger candidate
DECLARE_SOA_COLUMN(BdtScore0Trig, bdtScore0Trig, float); //! First BDT output score
DECLARE_SOA_COLUMN(BdtScore1Trig, bdtScore1Trig, float); //! Second BDT output score
DECLARE_SOA_COLUMN(NTpcCrossedRowsTrig, nTpcCrossedRowsTrig, int); //! Number of crossed TPC Rows
DECLARE_SOA_COLUMN(ItsClsMapTrig, itsClsMapTrig, int); //! ITS cluster map, one bit per a layer, starting from the innermost
DECLARE_SOA_COLUMN(ItsNClsTrig, itsNClsTrig, int); //! Number of ITS clusters
DECLARE_SOA_COLUMN(EtaTrigTrack, etaTrigTrack, float); //! Eta of the track
DECLARE_SOA_COLUMN(PhiTrigTrack, phiTrigTrack, float); //! Phi of the track
DECLARE_SOA_COLUMN(PtTrigTrack, ptTrigTrack, float); //! Pt of the track
DECLARE_SOA_COLUMN(DcaXYTrig, dcaXYTrig, float); //! Impact parameter in XY of the track to the primary vertex
DECLARE_SOA_COLUMN(DcaZTrig, dcaZTrig, float); //! Impact parameter in Z of the track to the primary vertex
DECLARE_SOA_COLUMN(NTpcCrossedRowsAssoc, nTpcCrossedRowsAssoc, int); //! Number of crossed TPC Rows
DECLARE_SOA_COLUMN(ItsClsMapAssoc, itsClsMapAssoc, int); //! ITS cluster map, one bit per a layer, starting from the innermost
DECLARE_SOA_COLUMN(ItsNClsAssoc, itsNClsAssoc, int); //! Number of ITS clusters
DECLARE_SOA_COLUMN(EtaAssoc, etaAssoc, float); //! Eta of the track
DECLARE_SOA_COLUMN(PhiAssoc, phiAssoc, float); //! Phi of the track
DECLARE_SOA_COLUMN(PtAssoc, ptAssoc, float); //! Pt of the track
DECLARE_SOA_COLUMN(DcaXYAssoc, dcaXYAssoc, float); //! Impact parameter in XY of the track to the primary vertex
DECLARE_SOA_COLUMN(DcaZAssoc, dcaZAssoc, float); //! Impact parameter in Z of the track to the primary vertex
} // namespace hf_correl_charm_had_reduced

DECLARE_SOA_TABLE(HfcRedTrigBases, "AOD", "HFCREDTRIGBASE", //! Table with trigger candidate base info
Expand Down
14 changes: 7 additions & 7 deletions PWGHF/HFC/TableProducer/correlatorFlowCharmHadronsReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ struct HfCorrelatorFlowCharmHadronsReduced {

int poolBins{0};

using SameEvtPairsChHad = soa::Filtered<soa::Join<aod::HfcRedSEBases, aod::HfcRedTrigCharms, aod::HfcRedAssocTrks>>;
using SameEvtPairsChHad = soa::Filtered<soa::Join<aod::HfcRedSEBases, aod::HfcRedTrigCharms, aod::HfcRedAssocTrks>>;
using SameEvtPairsHadHad = soa::Filtered<soa::Join<aod::HfcRedSEBases, aod::HfcRedTrigTrks, aod::HfcRedAssocTrks>>;
using AssocTracks = soa::Filtered<soa::Join<aod::HfcRedAssocBases, aod::HfcRedAssocTrks>>;
using AssocTracks = soa::Filtered<soa::Join<aod::HfcRedAssocBases, aod::HfcRedAssocTrks>>;
using TrigCharmCands = soa::Filtered<soa::Join<aod::HfcRedTrigBases, aod::HfcRedTrigCharms>>;

Filter filterAssocTracks = (nabs(aod::hf_correl_charm_had_reduced::dcaXYAssoc) < dcaXYTrackMax) && (nabs(aod::hf_correl_charm_had_reduced::dcaZAssoc) < dcaZTrackMax) && (aod::hf_correl_charm_had_reduced::nTpcCrossedRowsAssoc > tpcCrossedRowsMin) && (aod::hf_correl_charm_had_reduced::itsNClsAssoc > itsNClsMin);
Expand Down Expand Up @@ -150,10 +150,10 @@ struct HfCorrelatorFlowCharmHadronsReduced {

void init(InitContext&)
{
if ( (doprocessSameEventCharmHadWCentMix && doprocessMixedEventCharmHadWMultMix) ||
(doprocessSameEventCharmHadWMultMix && doprocessMixedEventCharmHadWCentMix) ||
(doprocessSameEventHadHadWCentMix && doprocessMixedEventHadHadWMultMix) ||
(doprocessSameEventHadHadWMultMix && doprocessMixedEventHadHadWCentMix) ) {
if ((doprocessSameEventCharmHadWCentMix && doprocessMixedEventCharmHadWMultMix) ||
(doprocessSameEventCharmHadWMultMix && doprocessMixedEventCharmHadWCentMix) ||
(doprocessSameEventHadHadWCentMix && doprocessMixedEventHadHadWMultMix) ||
(doprocessSameEventHadHadWMultMix && doprocessMixedEventHadHadWCentMix)) {
LOGP(fatal, "You cannot mix centrality and multiplicity mixing in the same processing! Please check your configuration!");
}
if (!fillSparses && !fillTables) {
Expand Down Expand Up @@ -268,7 +268,7 @@ struct HfCorrelatorFlowCharmHadronsReduced {
rowPairSE(poolBin, ptTrig, pair.ptAssoc(), pair.deltaEta(), pair.deltaPhi());
}
if constexpr (fillSparses) {
if constexpr (requires{ pair.bdtScore0Trig(); }) { // Separate Charm-Had and Had-Had cases
if constexpr (requires { pair.bdtScore0Trig(); }) { // Separate Charm-Had and Had-Had cases
registry.fill(HIST("hSparseCorrelationsSECharmHad"), poolBin, ptTrig, pair.ptAssoc(), pair.deltaEta(),
pair.deltaPhi(), pair.bdtScore0Trig(), pair.bdtScore1Trig(), pair.invMassTrig());
} else {
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 @@ -64,9 +64,9 @@ enum CandType {
struct HfDerivedDataCreatorCorrelationsReduced {
Produces<aod::HfcRedCorrColls> rowCollisions; // Table with reduced collision info
Produces<aod::HfcRedSEBases> rowSEPairs; // Table with same-event pairs info
Produces<aod::HfcRedAssocBases> rowAssocTrks; // Table with associated track info
Produces<aod::HfcRedAssocTrks> rowAssocTrkSels; // Table with associated track selection info
Produces<aod::HfcRedTrigBases> rowTrigs; // Table with charm candidate info
Produces<aod::HfcRedAssocBases> rowAssocTrks; // Table with associated track info
Produces<aod::HfcRedAssocTrks> rowAssocTrkSels; // Table with associated track selection info
Produces<aod::HfcRedTrigBases> rowTrigs; // Table with charm candidate info
Produces<aod::HfcRedTrigCharms> rowTrigCharms; // Table with charm trigger candidate info
Produces<aod::HfcRedTrigTrks> rowTrigHads; // Table with hadron trigger candidate info

Expand Down Expand Up @@ -271,7 +271,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
}

int trackGlobalIndex = assTrk.globalIndex();
if constexpr (candType == CandType::Hadron) {
if constexpr (candType == CandType::Hadron) {
if (!cand.isGlobalTrackWoDCA() || cand.tpcNClsCrossedRows() < tpcNClsCrossedRowsMin) {
return false;
}
Expand Down
Loading