Skip to content

Commit 2fa804c

Browse files
MarcellocostiMarcellocosti
authored
Merge pull request #41 from alibuild/alibot-cleanup-12989
[PWGHF] Please consider the following formatting changes to #12989
2 parents 326cd71 + 21fb70a commit 2fa804c

File tree

3 files changed

+37
-37
lines changed

3 files changed

+37
-37
lines changed

‎PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -106,32 +106,32 @@ DECLARE_SOA_TABLE(AssocTrackSels, "AOD", "ASSOCTRACKSEL", //! Table with associa
106106
// definition of columns and tables for Charm-Hadron and Hadron-Hadron correlation pairs
107107
namespace hf_correl_charm_had_reduced
108108
{
109-
DECLARE_SOA_INDEX_COLUMN(HfcRedCorrColl, hfcRedCorrColl); //! ReducedCollision index
110-
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float); //! DeltaPhi between charm hadron and Hadrons
111-
DECLARE_SOA_COLUMN(DeltaEta, deltaEta, float); //! DeltaEta between charm hadron and Hadrons
112-
DECLARE_SOA_COLUMN(PoolBin, poolBin, int); //! Pool Bin for the MixedEvent
113-
DECLARE_SOA_COLUMN(PhiTrig, phiTrig, float); //! Phi of the trigger candidate
114-
DECLARE_SOA_COLUMN(EtaTrig, etaTrig, float); //! Eta of the trigger candidate
115-
DECLARE_SOA_COLUMN(PtTrig, ptTrig, float); //! Pt of the trigger candidate
116-
DECLARE_SOA_COLUMN(InvMassTrig, invMassTrig, float); //! Invariant mass of Charm trigger candidate
117-
DECLARE_SOA_COLUMN(BdtScore0Trig, bdtScore0Trig, float); //! First BDT output score
118-
DECLARE_SOA_COLUMN(BdtScore1Trig, bdtScore1Trig, float); //! Second BDT output score
119-
DECLARE_SOA_COLUMN(NTpcCrossedRowsTrig, nTpcCrossedRowsTrig, int); //! Number of crossed TPC Rows
120-
DECLARE_SOA_COLUMN(ItsClsMapTrig, itsClsMapTrig, int); //! ITS cluster map, one bit per a layer, starting from the innermost
121-
DECLARE_SOA_COLUMN(ItsNClsTrig, itsNClsTrig, int); //! Number of ITS clusters
122-
DECLARE_SOA_COLUMN(EtaTrigTrack, etaTrigTrack, float); //! Eta of the track
123-
DECLARE_SOA_COLUMN(PhiTrigTrack, phiTrigTrack, float); //! Phi of the track
124-
DECLARE_SOA_COLUMN(PtTrigTrack, ptTrigTrack, float); //! Pt of the track
125-
DECLARE_SOA_COLUMN(DcaXYTrig, dcaXYTrig, float); //! Impact parameter in XY of the track to the primary vertex
126-
DECLARE_SOA_COLUMN(DcaZTrig, dcaZTrig, float); //! Impact parameter in Z of the track to the primary vertex
127-
DECLARE_SOA_COLUMN(NTpcCrossedRowsAssoc, nTpcCrossedRowsAssoc, int); //! Number of crossed TPC Rows
128-
DECLARE_SOA_COLUMN(ItsClsMapAssoc, itsClsMapAssoc, int); //! ITS cluster map, one bit per a layer, starting from the innermost
129-
DECLARE_SOA_COLUMN(ItsNClsAssoc, itsNClsAssoc, int); //! Number of ITS clusters
130-
DECLARE_SOA_COLUMN(EtaAssoc, etaAssoc, float); //! Eta of the track
131-
DECLARE_SOA_COLUMN(PhiAssoc, phiAssoc, float); //! Phi of the track
132-
DECLARE_SOA_COLUMN(PtAssoc, ptAssoc, float); //! Pt of the track
133-
DECLARE_SOA_COLUMN(DcaXYAssoc, dcaXYAssoc, float); //! Impact parameter in XY of the track to the primary vertex
134-
DECLARE_SOA_COLUMN(DcaZAssoc, dcaZAssoc, float); //! Impact parameter in Z of the track to the primary vertex
109+
DECLARE_SOA_INDEX_COLUMN(HfcRedCorrColl, hfcRedCorrColl); //! ReducedCollision index
110+
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float); //! DeltaPhi between charm hadron and Hadrons
111+
DECLARE_SOA_COLUMN(DeltaEta, deltaEta, float); //! DeltaEta between charm hadron and Hadrons
112+
DECLARE_SOA_COLUMN(PoolBin, poolBin, int); //! Pool Bin for the MixedEvent
113+
DECLARE_SOA_COLUMN(PhiTrig, phiTrig, float); //! Phi of the trigger candidate
114+
DECLARE_SOA_COLUMN(EtaTrig, etaTrig, float); //! Eta of the trigger candidate
115+
DECLARE_SOA_COLUMN(PtTrig, ptTrig, float); //! Pt of the trigger candidate
116+
DECLARE_SOA_COLUMN(InvMassTrig, invMassTrig, float); //! Invariant mass of Charm trigger candidate
117+
DECLARE_SOA_COLUMN(BdtScore0Trig, bdtScore0Trig, float); //! First BDT output score
118+
DECLARE_SOA_COLUMN(BdtScore1Trig, bdtScore1Trig, float); //! Second BDT output score
119+
DECLARE_SOA_COLUMN(NTpcCrossedRowsTrig, nTpcCrossedRowsTrig, int); //! Number of crossed TPC Rows
120+
DECLARE_SOA_COLUMN(ItsClsMapTrig, itsClsMapTrig, int); //! ITS cluster map, one bit per a layer, starting from the innermost
121+
DECLARE_SOA_COLUMN(ItsNClsTrig, itsNClsTrig, int); //! Number of ITS clusters
122+
DECLARE_SOA_COLUMN(EtaTrigTrack, etaTrigTrack, float); //! Eta of the track
123+
DECLARE_SOA_COLUMN(PhiTrigTrack, phiTrigTrack, float); //! Phi of the track
124+
DECLARE_SOA_COLUMN(PtTrigTrack, ptTrigTrack, float); //! Pt of the track
125+
DECLARE_SOA_COLUMN(DcaXYTrig, dcaXYTrig, float); //! Impact parameter in XY of the track to the primary vertex
126+
DECLARE_SOA_COLUMN(DcaZTrig, dcaZTrig, float); //! Impact parameter in Z of the track to the primary vertex
127+
DECLARE_SOA_COLUMN(NTpcCrossedRowsAssoc, nTpcCrossedRowsAssoc, int); //! Number of crossed TPC Rows
128+
DECLARE_SOA_COLUMN(ItsClsMapAssoc, itsClsMapAssoc, int); //! ITS cluster map, one bit per a layer, starting from the innermost
129+
DECLARE_SOA_COLUMN(ItsNClsAssoc, itsNClsAssoc, int); //! Number of ITS clusters
130+
DECLARE_SOA_COLUMN(EtaAssoc, etaAssoc, float); //! Eta of the track
131+
DECLARE_SOA_COLUMN(PhiAssoc, phiAssoc, float); //! Phi of the track
132+
DECLARE_SOA_COLUMN(PtAssoc, ptAssoc, float); //! Pt of the track
133+
DECLARE_SOA_COLUMN(DcaXYAssoc, dcaXYAssoc, float); //! Impact parameter in XY of the track to the primary vertex
134+
DECLARE_SOA_COLUMN(DcaZAssoc, dcaZAssoc, float); //! Impact parameter in Z of the track to the primary vertex
135135
} // namespace hf_correl_charm_had_reduced
136136

137137
DECLARE_SOA_TABLE(HfcRedTrigBases, "AOD", "HFCREDTRIGBASE", //! Table with trigger candidate base info

‎PWGHF/HFC/TableProducer/correlatorFlowCharmHadronsReduced.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ struct HfCorrelatorFlowCharmHadronsReduced {
115115

116116
int poolBins{0};
117117

118-
using SameEvtPairsChHad = soa::Filtered<soa::Join<aod::HfcRedSEBases, aod::HfcRedTrigCharms, aod::HfcRedAssocTrks>>;
118+
using SameEvtPairsChHad = soa::Filtered<soa::Join<aod::HfcRedSEBases, aod::HfcRedTrigCharms, aod::HfcRedAssocTrks>>;
119119
using SameEvtPairsHadHad = soa::Filtered<soa::Join<aod::HfcRedSEBases, aod::HfcRedTrigTrks, aod::HfcRedAssocTrks>>;
120-
using AssocTracks = soa::Filtered<soa::Join<aod::HfcRedAssocBases, aod::HfcRedAssocTrks>>;
120+
using AssocTracks = soa::Filtered<soa::Join<aod::HfcRedAssocBases, aod::HfcRedAssocTrks>>;
121121
using TrigCharmCands = soa::Filtered<soa::Join<aod::HfcRedTrigBases, aod::HfcRedTrigCharms>>;
122122

123123
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);
@@ -150,10 +150,10 @@ struct HfCorrelatorFlowCharmHadronsReduced {
150150

151151
void init(InitContext&)
152152
{
153-
if ( (doprocessSameEventCharmHadWCentMix && doprocessMixedEventCharmHadWMultMix) ||
154-
(doprocessSameEventCharmHadWMultMix && doprocessMixedEventCharmHadWCentMix) ||
155-
(doprocessSameEventHadHadWCentMix && doprocessMixedEventHadHadWMultMix) ||
156-
(doprocessSameEventHadHadWMultMix && doprocessMixedEventHadHadWCentMix) ) {
153+
if ((doprocessSameEventCharmHadWCentMix && doprocessMixedEventCharmHadWMultMix) ||
154+
(doprocessSameEventCharmHadWMultMix && doprocessMixedEventCharmHadWCentMix) ||
155+
(doprocessSameEventHadHadWCentMix && doprocessMixedEventHadHadWMultMix) ||
156+
(doprocessSameEventHadHadWMultMix && doprocessMixedEventHadHadWCentMix)) {
157157
LOGP(fatal, "You cannot mix centrality and multiplicity mixing in the same processing! Please check your configuration!");
158158
}
159159
if (!fillSparses && !fillTables) {
@@ -268,7 +268,7 @@ struct HfCorrelatorFlowCharmHadronsReduced {
268268
rowPairSE(poolBin, ptTrig, pair.ptAssoc(), pair.deltaEta(), pair.deltaPhi());
269269
}
270270
if constexpr (fillSparses) {
271-
if constexpr (requires{ pair.bdtScore0Trig(); }) { // Separate Charm-Had and Had-Had cases
271+
if constexpr (requires { pair.bdtScore0Trig(); }) { // Separate Charm-Had and Had-Had cases
272272
registry.fill(HIST("hSparseCorrelationsSECharmHad"), poolBin, ptTrig, pair.ptAssoc(), pair.deltaEta(),
273273
pair.deltaPhi(), pair.bdtScore0Trig(), pair.bdtScore1Trig(), pair.invMassTrig());
274274
} else {

‎PWGHF/HFC/TableProducer/derivedDataCreatorCorrelationsReduced.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ enum CandType {
6464
struct HfDerivedDataCreatorCorrelationsReduced {
6565
Produces<aod::HfcRedCorrColls> rowCollisions; // Table with reduced collision info
6666
Produces<aod::HfcRedSEBases> rowSEPairs; // Table with same-event pairs info
67-
Produces<aod::HfcRedAssocBases> rowAssocTrks; // Table with associated track info
68-
Produces<aod::HfcRedAssocTrks> rowAssocTrkSels; // Table with associated track selection info
69-
Produces<aod::HfcRedTrigBases> rowTrigs; // Table with charm candidate info
67+
Produces<aod::HfcRedAssocBases> rowAssocTrks; // Table with associated track info
68+
Produces<aod::HfcRedAssocTrks> rowAssocTrkSels; // Table with associated track selection info
69+
Produces<aod::HfcRedTrigBases> rowTrigs; // Table with charm candidate info
7070
Produces<aod::HfcRedTrigCharms> rowTrigCharms; // Table with charm trigger candidate info
7171
Produces<aod::HfcRedTrigTrks> rowTrigHads; // Table with hadron trigger candidate info
7272

@@ -271,7 +271,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
271271
}
272272

273273
int trackGlobalIndex = assTrk.globalIndex();
274-
if constexpr (candType == CandType::Hadron) {
274+
if constexpr (candType == CandType::Hadron) {
275275
if (!cand.isGlobalTrackWoDCA() || cand.tpcNClsCrossedRows() < tpcNClsCrossedRowsMin) {
276276
return false;
277277
}

0 commit comments

Comments
 (0)