Skip to content

Commit 532862f

Browse files
MarcellocostiMarcellocosti
authored
Merge pull request #42 from alibuild/alibot-cleanup-12989
[PWGHF] Please consider the following formatting changes to #12989
2 parents 5539e6e + 6ead8e9 commit 532862f

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed

‎PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -107,28 +107,28 @@ DECLARE_SOA_TABLE(AssocTrackSels, "AOD", "ASSOCTRACKSEL", //! Table with associa
107107
namespace hf_correl_charm_had_reduced
108108
{
109109
// Correlation columns
110-
DECLARE_SOA_INDEX_COLUMN(HfcRedCorrColl, hfcRedCorrColl); //! ReducedCollision index
111-
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float); //! DeltaPhi between charm hadron and Hadrons
112-
DECLARE_SOA_COLUMN(DeltaEta, deltaEta, float); //! DeltaEta between charm hadron and Hadrons
113-
DECLARE_SOA_COLUMN(PoolBin, poolBin, int); //! Pool Bin for the MixedEvent
110+
DECLARE_SOA_INDEX_COLUMN(HfcRedCorrColl, hfcRedCorrColl); //! ReducedCollision index
111+
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float); //! DeltaPhi between charm hadron and Hadrons
112+
DECLARE_SOA_COLUMN(DeltaEta, deltaEta, float); //! DeltaEta between charm hadron and Hadrons
113+
DECLARE_SOA_COLUMN(PoolBin, poolBin, int); //! Pool Bin for the MixedEvent
114114
// General trigger particle columns
115-
DECLARE_SOA_COLUMN(PhiTrig, phiTrig, float); //! Phi of the trigger candidate
116-
DECLARE_SOA_COLUMN(EtaTrig, etaTrig, float); //! Eta of the trigger candidate
117-
DECLARE_SOA_COLUMN(PtTrig, ptTrig, float); //! Pt of the trigger candidate
115+
DECLARE_SOA_COLUMN(PhiTrig, phiTrig, float); //! Phi of the trigger candidate
116+
DECLARE_SOA_COLUMN(EtaTrig, etaTrig, float); //! Eta of the trigger candidate
117+
DECLARE_SOA_COLUMN(PtTrig, ptTrig, float); //! Pt of the trigger candidate
118118
// Charm trigger particle selection columns
119-
DECLARE_SOA_COLUMN(InvMassTrig, invMassTrig, float); //! Invariant mass of Charm trigger candidate
120-
DECLARE_SOA_COLUMN(BdtScore0Trig, bdtScore0Trig, float); //! First BDT output score
121-
DECLARE_SOA_COLUMN(BdtScore1Trig, bdtScore1Trig, float); //! Second BDT output score
119+
DECLARE_SOA_COLUMN(InvMassTrig, invMassTrig, float); //! Invariant mass of Charm trigger candidate
120+
DECLARE_SOA_COLUMN(BdtScore0Trig, bdtScore0Trig, float); //! First BDT output score
121+
DECLARE_SOA_COLUMN(BdtScore1Trig, bdtScore1Trig, float); //! Second BDT output score
122122
// Hadron trigger particle selection columns
123-
DECLARE_SOA_COLUMN(NTpcCrossedRowsTrig, nTpcCrossedRowsTrig, int); //! Number of crossed TPC Rows
124-
DECLARE_SOA_COLUMN(ItsClsMapTrig, itsClsMapTrig, int); //! ITS cluster map, one bit per a layer, starting from the innermost
125-
DECLARE_SOA_COLUMN(ItsNClsTrig, itsNClsTrig, int); //! Number of ITS clusters
126-
DECLARE_SOA_COLUMN(DcaXYTrig, dcaXYTrig, float); //! Impact parameter in XY of the track to the primary vertex
127-
DECLARE_SOA_COLUMN(DcaZTrig, dcaZTrig, float); //! Impact parameter in Z of the track to the primary vertex
123+
DECLARE_SOA_COLUMN(NTpcCrossedRowsTrig, nTpcCrossedRowsTrig, int); //! Number of crossed TPC Rows
124+
DECLARE_SOA_COLUMN(ItsClsMapTrig, itsClsMapTrig, int); //! ITS cluster map, one bit per a layer, starting from the innermost
125+
DECLARE_SOA_COLUMN(ItsNClsTrig, itsNClsTrig, int); //! Number of ITS clusters
126+
DECLARE_SOA_COLUMN(DcaXYTrig, dcaXYTrig, float); //! Impact parameter in XY of the track to the primary vertex
127+
DECLARE_SOA_COLUMN(DcaZTrig, dcaZTrig, float); //! Impact parameter in Z of the track to the primary vertex
128128
// General associated particle columns
129-
DECLARE_SOA_COLUMN(EtaAssoc, etaAssoc, float); //! Eta of the associated candidate
130-
DECLARE_SOA_COLUMN(PhiAssoc, phiAssoc, float); //! Phi of the associated candidate
131-
DECLARE_SOA_COLUMN(PtAssoc, ptAssoc, float); //! Pt of the associated candidate
129+
DECLARE_SOA_COLUMN(EtaAssoc, etaAssoc, float); //! Eta of the associated candidate
130+
DECLARE_SOA_COLUMN(PhiAssoc, phiAssoc, float); //! Phi of the associated candidate
131+
DECLARE_SOA_COLUMN(PtAssoc, ptAssoc, float); //! Pt of the associated candidate
132132
// Hadron associated particle selection columns
133133
DECLARE_SOA_COLUMN(NTpcCrossedRowsAssoc, nTpcCrossedRowsAssoc, int); //! Number of crossed TPC Rows
134134
DECLARE_SOA_COLUMN(ItsClsMapAssoc, itsClsMapAssoc, int); //! ITS cluster map, one bit per a layer, starting from the innermost

‎PWGHF/HFC/TableProducer/correlatorFlowCharmHadronsReduced.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ double getPhi(const TTrack& track)
9090
}
9191

9292
struct HfCorrelatorFlowCharmHadronsReduced {
93-
Produces<aod::HfcRedSEChHads> rowPairSECharmHads; //! Correlation pairs information Same Event
94-
Produces<aod::HfcRedMEChHads> rowPairMECharmHads; //! Correlation pairs information Mixed Event
95-
Produces<aod::HfcRedSEHadHads> rowPairSEHadHads; //! Correlation pairs information Same Event
96-
Produces<aod::HfcRedMEHadHads> rowPairMEHadHads; //! Correlation pairs information Mixed Event
93+
Produces<aod::HfcRedSEChHads> rowPairSECharmHads; //! Correlation pairs information Same Event
94+
Produces<aod::HfcRedMEChHads> rowPairMECharmHads; //! Correlation pairs information Mixed Event
95+
Produces<aod::HfcRedSEHadHads> rowPairSEHadHads; //! Correlation pairs information Same Event
96+
Produces<aod::HfcRedMEHadHads> rowPairMEHadHads; //! Correlation pairs information Mixed Event
9797

9898
Configurable<bool> fillSparses{"fillSparses", true, "Fill sparse histograms"};
9999
Configurable<bool> fillTables{"fillTables", false, "Fill tables"};
@@ -157,7 +157,7 @@ struct HfCorrelatorFlowCharmHadronsReduced {
157157
if (!fillSparses && !fillTables) {
158158
LOGP(fatal, "At least one of fillSparses or fillTables must be true!");
159159
}
160-
if (binsPtTrig.value.size() != (bkgScoresPtMaxs.value.size() + 1) ) {
160+
if (binsPtTrig.value.size() != (bkgScoresPtMaxs.value.size() + 1)) {
161161
LOGP(fatal, "The size of binsPtTrig must be the one of bkgScorePtMaxs plus one!");
162162
}
163163

@@ -244,10 +244,10 @@ struct HfCorrelatorFlowCharmHadronsReduced {
244244
/// Apply pT-differential ML BDT bkg score cut
245245
/// \param ptTrig is the pT of the charm candidate
246246
template <typename TCand>
247-
bool applyMlBkgScoreCut(TCand const& cand,
247+
bool applyMlBkgScoreCut(TCand const& cand,
248248
double ptTrig)
249249
{
250-
for (size_t iPt = 0; iPt < binsPtTrig.value.size()-1; iPt++) {
250+
for (size_t iPt = 0; iPt < binsPtTrig.value.size() - 1; iPt++) {
251251
if (ptTrig >= binsPtTrig.value[iPt] && ptTrig < binsPtTrig.value[iPt + 1]) {
252252
return cand.bdtScore0Trig() < bkgScoresPtMaxs.value[iPt];
253253
}

‎PWGHF/HFC/TableProducer/derivedDataCreatorCorrelationsReduced.cxx‎

Lines changed: 7 additions & 7 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::HfcRedSEBases> rowSEPairs; // Table with same-event pairs info
67-
Produces<aod::HfcRedAssBases> rowAssocBases; // Table with associated candidate base info
68-
Produces<aod::HfcRedAssTracks> rowAssocTrkSels; // Table with associated track selection info
69-
Produces<aod::HfcRedTrigBases> rowTrigBases; // Table with base trigger candidate info
70-
Produces<aod::HfcRedTrigCharms> rowTrigCharms; // Table with charm trigger candidate selection info
71-
Produces<aod::HfcRedTrigTracks> rowTrigHads; // Table with hadron trigger candidate selection info
65+
Produces<aod::HfcRedCorrColls> rowCollisions; // Table with reduced collision info
66+
Produces<aod::HfcRedSEBases> rowSEPairs; // Table with same-event pairs info
67+
Produces<aod::HfcRedAssBases> rowAssocBases; // Table with associated candidate base info
68+
Produces<aod::HfcRedAssTracks> rowAssocTrkSels; // Table with associated track selection info
69+
Produces<aod::HfcRedTrigBases> rowTrigBases; // Table with base trigger candidate info
70+
Produces<aod::HfcRedTrigCharms> rowTrigCharms; // Table with charm trigger candidate selection info
71+
Produces<aod::HfcRedTrigTracks> rowTrigHads; // Table with hadron trigger candidate selection 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)"};

0 commit comments

Comments
 (0)