Skip to content

Commit 0902568

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent bd9b294 commit 0902568

3 files changed

Lines changed: 39 additions & 39 deletions

File tree

‎PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,21 @@ DECLARE_SOA_TABLE(DsCandSelInfos, "AOD", "DSCANDSELINFO", //! Table with Ds cand
7777

7878
namespace hf_correlation_trigger_reduced
7979
{
80-
DECLARE_SOA_INDEX_COLUMN(HfcRedCorrColl, hfcRedCorrColl); //! ReducedCollision index
81-
DECLARE_SOA_COLUMN(PhiTrig, phiTrig, float); //! Phi of the trigger candidate
82-
DECLARE_SOA_COLUMN(EtaTrig, etaTrig, float); //! Eta of the trigger candidate
83-
DECLARE_SOA_COLUMN(PtTrig, ptTrig, float); //! Pt of the trigger candidate
84-
DECLARE_SOA_COLUMN(InvMassTrig, invMassTrig, float); //! Invariant mass of Charm trigger candidate
85-
DECLARE_SOA_COLUMN(BdtScore0Trig, bdtScore0Trig, float); //! First BDT output score
86-
DECLARE_SOA_COLUMN(BdtScore1Trig, bdtScore1Trig, float); //! Second BDT output score
87-
DECLARE_SOA_COLUMN(NTpcCrossedRowsTrig, nTpcCrossedRowsTrig, int); //! Number of crossed TPC Rows
88-
DECLARE_SOA_COLUMN(ItsClusterMapTrig, itsClusterMapTrig, int); //! ITS cluster map, one bit per a layer, starting from the innermost
89-
DECLARE_SOA_COLUMN(ItsNClsTrig, itsNClsTrig, int); //! Number of ITS clusters
90-
DECLARE_SOA_COLUMN(EtaTrigTrack, etaTrigTrack, float); //! Eta of the track
91-
DECLARE_SOA_COLUMN(PhiTrigTrack, phiTrigTrack, float); //! Phi of the track
92-
DECLARE_SOA_COLUMN(PtTrigTrack, ptTrigTrack, float); //! Pt of the track
93-
DECLARE_SOA_COLUMN(DcaXYTrig, dcaXYTrig, float); //! Impact parameter in XY of the track to the primary vertex
94-
DECLARE_SOA_COLUMN(DcaZTrig, dcaZTrig, float); //! Impact parameter in Z of the track to the primary vertex
80+
DECLARE_SOA_INDEX_COLUMN(HfcRedCorrColl, hfcRedCorrColl); //! ReducedCollision index
81+
DECLARE_SOA_COLUMN(PhiTrig, phiTrig, float); //! Phi of the trigger candidate
82+
DECLARE_SOA_COLUMN(EtaTrig, etaTrig, float); //! Eta of the trigger candidate
83+
DECLARE_SOA_COLUMN(PtTrig, ptTrig, float); //! Pt of the trigger candidate
84+
DECLARE_SOA_COLUMN(InvMassTrig, invMassTrig, float); //! Invariant mass of Charm trigger candidate
85+
DECLARE_SOA_COLUMN(BdtScore0Trig, bdtScore0Trig, float); //! First BDT output score
86+
DECLARE_SOA_COLUMN(BdtScore1Trig, bdtScore1Trig, float); //! Second BDT output score
87+
DECLARE_SOA_COLUMN(NTpcCrossedRowsTrig, nTpcCrossedRowsTrig, int); //! Number of crossed TPC Rows
88+
DECLARE_SOA_COLUMN(ItsClusterMapTrig, itsClusterMapTrig, int); //! ITS cluster map, one bit per a layer, starting from the innermost
89+
DECLARE_SOA_COLUMN(ItsNClsTrig, itsNClsTrig, int); //! Number of ITS clusters
90+
DECLARE_SOA_COLUMN(EtaTrigTrack, etaTrigTrack, float); //! Eta of the track
91+
DECLARE_SOA_COLUMN(PhiTrigTrack, phiTrigTrack, float); //! Phi of the track
92+
DECLARE_SOA_COLUMN(PtTrigTrack, ptTrigTrack, float); //! Pt of the track
93+
DECLARE_SOA_COLUMN(DcaXYTrig, dcaXYTrig, float); //! Impact parameter in XY of the track to the primary vertex
94+
DECLARE_SOA_COLUMN(DcaZTrig, dcaZTrig, float); //! Impact parameter in Z of the track to the primary vertex
9595
} // namespace hf_correlation_trigger_reduced
9696

9797
DECLARE_SOA_TABLE(HfcRedTrigs, "AOD", "HFCREDTRIG", //! Table with charm hadron candidate info
@@ -117,16 +117,16 @@ DECLARE_SOA_TABLE(HfcRedTrigHads, "AOD", "HFCREDTRIGHAD", //! Table with Same Ev
117117

118118
namespace hf_assoc_track_reduced
119119
{
120-
DECLARE_SOA_INDEX_COLUMN(HfcRedCorrColl, hfcRedCorrColl); //! ReducedCollision index
121-
DECLARE_SOA_COLUMN(OriginTrackId, originTrackId, int); //! Original track index
122-
DECLARE_SOA_COLUMN(NTpcCrossedRows, nTpcCrossedRows, int); //! Number of crossed TPC Rows
123-
DECLARE_SOA_COLUMN(ItsClusterMap, itsClusterMap, int); //! ITS cluster map, one bit per a layer, starting from the innermost
124-
DECLARE_SOA_COLUMN(ItsNCls, itsNCls, int); //! Number of ITS clusters
125-
DECLARE_SOA_COLUMN(EtaAssocTrack, etaAssocTrack, float); //! Eta of the track
126-
DECLARE_SOA_COLUMN(PhiAssocTrack, phiAssocTrack, float); //! Phi of the track
127-
DECLARE_SOA_COLUMN(PtAssocTrack, ptAssocTrack, float); //! Pt of the track
128-
DECLARE_SOA_COLUMN(DcaXY, dcaXY, float); //! Impact parameter in XY of the track to the primary vertex
129-
DECLARE_SOA_COLUMN(DcaZ, dcaZ, float); //! Impact parameter in Z of the track to the primary vertex
120+
DECLARE_SOA_INDEX_COLUMN(HfcRedCorrColl, hfcRedCorrColl); //! ReducedCollision index
121+
DECLARE_SOA_COLUMN(OriginTrackId, originTrackId, int); //! Original track index
122+
DECLARE_SOA_COLUMN(NTpcCrossedRows, nTpcCrossedRows, int); //! Number of crossed TPC Rows
123+
DECLARE_SOA_COLUMN(ItsClusterMap, itsClusterMap, int); //! ITS cluster map, one bit per a layer, starting from the innermost
124+
DECLARE_SOA_COLUMN(ItsNCls, itsNCls, int); //! Number of ITS clusters
125+
DECLARE_SOA_COLUMN(EtaAssocTrack, etaAssocTrack, float); //! Eta of the track
126+
DECLARE_SOA_COLUMN(PhiAssocTrack, phiAssocTrack, float); //! Phi of the track
127+
DECLARE_SOA_COLUMN(PtAssocTrack, ptAssocTrack, float); //! Pt of the track
128+
DECLARE_SOA_COLUMN(DcaXY, dcaXY, float); //! Impact parameter in XY of the track to the primary vertex
129+
DECLARE_SOA_COLUMN(DcaZ, dcaZ, float); //! Impact parameter in Z of the track to the primary vertex
130130
} // namespace hf_assoc_track_reduced
131131
DECLARE_SOA_TABLE(AssocTrackReds, "AOD", "ASSOCTRACKRED", //! Table with associated track info
132132
soa::Index<>,

‎PWGHF/HFC/TableProducer/correlatorFlowCharmHadronsReduced.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ struct HfCorrelatorFlowCharmHadronsReduced {
236236
entryCorrPair(poolBin, pair.ptTrig(), pair.ptAssocTrack(), pair.deltaEta(), pair.deltaPhi());
237237
}
238238
if constexpr (fillSparses) {
239-
if constexpr (requires{ pair.bdtScore0Trig(); }) { // Separate Charm-Had and Had-Had cases
239+
if constexpr (requires { pair.bdtScore0Trig(); }) { // Separate Charm-Had and Had-Had cases
240240
registry.fill(HIST("hSparseCorrelationsSECharmHad"), poolBin, pair.ptTrig(), pair.ptAssocTrack(), pair.deltaEta(),
241241
pair.deltaPhi(), pair.bdtScore0Trig(), pair.bdtScore1Trig(), pair.invMassTrig());
242242
} else {
@@ -281,7 +281,7 @@ struct HfCorrelatorFlowCharmHadronsReduced {
281281
if (downSamplePairsME < 1.) {
282282
float pseudoRndm = ptAssoc * 1000. - static_cast<int64_t>(ptAssoc * 1000);
283283
if (ptTrig < ptMaxForDownSampleME && trigColl.centrality() < centMaxForDownSampleME &&
284-
assocColl.centrality() < centMaxForDownSampleME && pseudoRndm >= downSamplePairsME) {
284+
assocColl.centrality() < centMaxForDownSampleME && pseudoRndm >= downSamplePairsME) {
285285
continue;
286286
}
287287
}
@@ -290,7 +290,7 @@ struct HfCorrelatorFlowCharmHadronsReduced {
290290
entryCorrPair(poolBinTrig, ptTrig, ptAssoc, deltaEta, deltaPhi);
291291
}
292292
if constexpr (fillSparses) {
293-
if constexpr (requires{ trigCand.bdtScore0(); }) { // Separate Charm-Had and Had-Had cases
293+
if constexpr (requires { trigCand.bdtScore0(); }) { // Separate Charm-Had and Had-Had cases
294294
registry.fill(HIST("hSparseCorrelationsMECharmHad"), poolBinTrig, ptTrig, ptAssoc, deltaEta,
295295
deltaPhi, trigCand.bdtScore0(), trigCand.bdtScore1(), trigCand.invMassCand());
296296
} else {

‎PWGHF/HFC/TableProducer/derivedDataCreatorCorrelationsReduced.cxx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ enum CandType {
6262

6363
/// Code to select collisions with at least one Ds meson
6464
struct HfDerivedDataCreatorCorrelationsReduced {
65-
Produces<aod::HfcRedCorrColls> rowCollisions; // Table with reduced collision info
66-
Produces<aod::HfcRedSEPairs> rowSEPairs; // Table with same-event pairs info
67-
Produces<aod::HfcRedTrkAssocs> rowAssocTrks; // Table with associated track info
68-
Produces<aod::HfcRedTrkSels> rowAssocTrkSels; // Table with associated track selection info
69-
Produces<aod::HfcRedTrigs> rowTrigs; // Table with charm candidate info
70-
Produces<aod::HfcRedTrigCharms> rowTrigCharms; // Table with charm trigger candidate info
71-
Produces<aod::HfcRedTrigHads> rowTrigHads; // Table with hadron trigger candidate info
65+
Produces<aod::HfcRedCorrColls> rowCollisions; // Table with reduced collision info
66+
Produces<aod::HfcRedSEPairs> rowSEPairs; // Table with same-event pairs info
67+
Produces<aod::HfcRedTrkAssocs> rowAssocTrks; // Table with associated track info
68+
Produces<aod::HfcRedTrkSels> rowAssocTrkSels; // Table with associated track selection info
69+
Produces<aod::HfcRedTrigs> rowTrigs; // Table with charm candidate info
70+
Produces<aod::HfcRedTrigCharms> rowTrigCharms; // Table with charm trigger candidate info
71+
Produces<aod::HfcRedTrigHads> rowTrigHads; // Table with hadron trigger candidate info
7272

7373
Configurable<int> centEstimator{"centEstimator", 2, "Centrality estimation (FT0A: 1, FT0C: 2, FT0M: 3, FV0A: 4)"};
7474
Configurable<int> selectionFlag{"selectionFlag", 15, "Selection Flag for hadron (ML score tables are required to run the task)"};
@@ -270,14 +270,14 @@ struct HfDerivedDataCreatorCorrelationsReduced {
270270
return false;
271271
}
272272

273-
if constexpr (candType == CandType::Hadron) {
273+
if constexpr (candType == CandType::Hadron) {
274274
if (!cand.isGlobalTrackWoDCA() || cand.tpcNClsCrossedRows() < tpcNClsCrossedRowsMin) {
275275
return false;
276276
}
277277
if (assTrk.globalIndex() == cand.globalIndex()) {
278278
return false; // skip self-correlation for hadron-hadron
279279
}
280-
} else { // Remove Daughter-Cand pairs for charm-hadron correlations
280+
} else { // Remove Daughter-Cand pairs for charm-hadron correlations
281281
if constexpr ((requires { cand.prong2Id(); })) { // Check 3-prong
282282
return (assTrk.globalIndex() == cand.prong0Id() || assTrk.globalIndex() == cand.prong1Id() || assTrk.globalIndex() == cand.prong2Id());
283283
} else { // Check 2-prong
@@ -312,7 +312,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
312312
}
313313
registry.fill(HIST("hPhiVsPtTrigAssoc"), RecoDecay::constrainAngle(assTrk.phi(), -o2::constants::math::PIHalf), trigCand.pt(), assTrkPt);
314314
registry.fill(HIST("hEtaVsPtAssoc"), assTrk.eta(), trigCand.pt(), assTrkPt);
315-
315+
316316
double deltaEta = assTrk.eta() - trigCand.eta();
317317
double deltaPhi = RecoDecay::constrainAngle(assTrk.phi() - trigCand.phi(), -o2::constants::math::PIHalf);
318318
rowSEPairs(rowCollisions.lastIndex(), trigCand.pt(), assTrkPt, deltaEta, deltaPhi);
@@ -350,7 +350,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
350350
continue;
351351
}
352352
double assTrkPt = assTrk.pt();
353-
if (!first && downSampleTrksFactor < 1.) { // skip downsampling for the first track to avoid empty tables
353+
if (!first && downSampleTrksFactor < 1.) { // skip downsampling for the first track to avoid empty tables
354354
float pseudoRndm = assTrkPt * 1000. - static_cast<int64_t>(assTrkPt * 1000);
355355
if (assTrkPt < ptMaxForDownSample && collCentrality < centMaxForDownSample && pseudoRndm >= downSampleTrksFactor) {
356356
continue;

0 commit comments

Comments
 (0)