Skip to content

Commit a5ddb68

Browse files
authored
Merge pull request #51 from alibuild/alibot-cleanup-12014
Please consider the following formatting changes to AliceO2Group#12014
2 parents 2990599 + 4a7b37f commit a5ddb68

File tree

8 files changed

+444
-458
lines changed

8 files changed

+444
-458
lines changed

PWGHF/Core/DecayChannels.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ enum DecayChannelMain : int8_t {
234234
// Ds1(2536)+
235235
Ds1ToDstarK0s = 5, // D*+ K0s
236236
// Ds2*(2573)+
237-
Ds2starToD0Kplus = 6, // D0 K+
237+
Ds2starToD0Kplus = 6, // D0 K+
238238
Ds2starToDplusK0s = 7, // D+ K0s
239239
Ds2starToDstarK0s = 8, // D*+ K0s
240240
// Ds1*(2700)+
@@ -252,7 +252,7 @@ enum DecayChannelMain : int8_t {
252252
// Xic(3080)+
253253
Xic3080plusToDplusLambda = 15 // D+ Λ
254254
};
255-
}
255+
} // namespace hf_cand_reso
256256
} // namespace o2::hf_decay
257257

258258
#endif // PWGHF_CORE_DECAYCHANNELS_H_

PWGHF/D2H/Core/SelectorCutsRedDataFormat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static constexpr int NCutVars = 7;
9595
constexpr double Cuts[1][NCutVars] = {{0.1, 3, 40, 4, 3, -1, -1}}; // nSigmaTpc, nSigmaTof, nSigmaCombined
9696
// row labels
9797
static const std::vector<std::string> labelsCutVar = {"ptMin", "itsNClsMin", "tpcNCrossedRowsMin", "tpcChi2Max", "nSigmaTpc", "nSigmaTof", "nSigmaComb"};
98-
}
98+
} // namespace hf_cuts_track_daughter
9999

100100
} // namespace o2::analysis
101101
#endif // PWGHF_D2H_CORE_SELECTORCUTSREDDATAFORMAT_H_

PWGHF/D2H/DataModel/ReducedDataModel.h

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,7 @@ DECLARE_SOA_TABLE(HfCandLbConfigs, "AOD", "HFCANDLBCONFIG", //! Table with confi
11611161
// Charm resonances analysis
11621162
namespace hf_reso_3_prong
11631163
{
1164-
DECLARE_SOA_COLUMN(Sign, sign, int8_t); //! Integer with selected D candidate sign
1164+
DECLARE_SOA_COLUMN(Sign, sign, int8_t); //! Integer with selected D candidate sign
11651165
DECLARE_SOA_COLUMN(ItsNClsSoftPi, itsNClsSoftPi, int); //! minimum value of number of ITS clusters for the decay daughter tracks
11661166
DECLARE_SOA_COLUMN(TpcNClsCrossedRowsSoftPi, tpcNClsCrossedRowsSoftPi, int); //! minimum value of number of TPC crossed rows for the decay daughter tracks
11671167
DECLARE_SOA_COLUMN(TpcChi2NClSoftPi, tpcChi2NClSoftPi, float); //! maximum value of TPC chi2 for the decay daughter tracks
@@ -1368,7 +1368,6 @@ DECLARE_SOA_TABLE(HfRedDstarNoTrks, "AOD", "HFREDDSTARNOTRK", //! Table with 3 p
13681368
hf_cand::PVectorProng2<hf_cand::PxProng2, hf_cand::PyProng2, hf_cand::PzProng2>,
13691369
hf_reso_3_prong::PVector<hf_cand::PxProng0, hf_cand::PyProng0, hf_cand::PzProng0, hf_cand::PxProng1, hf_cand::PyProng1, hf_cand::PzProng1, hf_cand::PxProng2, hf_cand::PyProng2, hf_cand::PzProng2>);
13701370

1371-
13721371
namespace hf_reso_cand_reduced
13731372
{
13741373
DECLARE_SOA_COLUMN(InvMass, invMass, float); //! Invariant mass in GeV/c2
@@ -1381,7 +1380,7 @@ DECLARE_SOA_COLUMN(FlagMcMatchRec, flagMcMatchRec, int8_t); // fla
13811380
DECLARE_SOA_COLUMN(FlagMcMatchRecD, flagMcMatchRecD, int8_t); // flag for D meson bachelor decay channel classification reconstruction level
13821381
DECLARE_SOA_COLUMN(FlagMcMatchChanD, flagMcMatchChanD, int8_t); // flag for D meson resonant channel classification reconstruction level
13831382
DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t); // flag for decay channel classification generator level
1384-
DECLARE_SOA_COLUMN(DebugMcRec, debugMcRec, uint16_t); // debug flag for mis-association at reconstruction level
1383+
DECLARE_SOA_COLUMN(DebugMcRec, debugMcRec, uint16_t); // debug flag for mis-association at reconstruction level
13851384
DECLARE_SOA_COLUMN(Origin, origin, int8_t); // Flag for origin of MC particle 1=promt, 2=FD
13861385
DECLARE_SOA_COLUMN(SignD0, signD0, int8_t); // Sign of the D0 in the channels with D* -> D0 pi, needed in case of non-matched D*
13871386
DECLARE_SOA_COLUMN(PtGen, ptGen, float); // Pt at generation level in GeV/c
@@ -1394,30 +1393,36 @@ DECLARE_SOA_DYNAMIC_COLUMN(PtProng1, ptProng1, //!
13941393
[](float pxProng1, float pyProng1) -> float { return RecoDecay::pt(pxProng1, pyProng1); });
13951394
} // namespace hf_reso_cand_reduced
13961395

1397-
namespace hf_reso_3pr_v0{
1398-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed3PrNoTrks, "_0"); //! Prong0 index (D daughter)
1399-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedVzeros, "_1"); //! Prong1 index (V0 daughter)
1400-
}
1401-
namespace hf_reso_dstar_v0{
1402-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRedDstarNoTrks, "_0"); //! Prong0 index (D daughter)
1403-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedVzeros, "_1"); //! Prong1 index (V0 daughter)
1404-
}
1405-
namespace hf_reso_2pr_v0{
1406-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed2PrNoTrks, "_0"); //! Prong0 index (D daughter)
1407-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedVzeros, "_1"); //! Prong1 index (V0 daughter)
1408-
}
1409-
namespace hf_reso_3pr_trk{
1410-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed3PrNoTrks, "_0"); //! Prong0 index (D daughter)
1411-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedTrkNoParams, "_1"); //! Prong1 index (Track daughter)
1412-
}
1413-
namespace hf_reso_dstar_trk{
1414-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRedDstarNoTrks, "_0"); //! Prong0 index (D daughter)
1415-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedTrkNoParams, "_1"); //! Prong1 index (Track daughter)
1416-
}
1417-
namespace hf_reso_2pr_trk{
1418-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed2PrNoTrks, "_0"); //! Prong0 index (D daughter)
1419-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedTrkNoParams, "_1"); //! Prong1 index (Track daughter)
1420-
}
1396+
namespace hf_reso_3pr_v0
1397+
{
1398+
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed3PrNoTrks, "_0"); //! Prong0 index (D daughter)
1399+
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedVzeros, "_1"); //! Prong1 index (V0 daughter)
1400+
} // namespace hf_reso_3pr_v0
1401+
namespace hf_reso_dstar_v0
1402+
{
1403+
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRedDstarNoTrks, "_0"); //! Prong0 index (D daughter)
1404+
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedVzeros, "_1"); //! Prong1 index (V0 daughter)
1405+
} // namespace hf_reso_dstar_v0
1406+
namespace hf_reso_2pr_v0
1407+
{
1408+
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed2PrNoTrks, "_0"); //! Prong0 index (D daughter)
1409+
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedVzeros, "_1"); //! Prong1 index (V0 daughter)
1410+
} // namespace hf_reso_2pr_v0
1411+
namespace hf_reso_3pr_trk
1412+
{
1413+
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed3PrNoTrks, "_0"); //! Prong0 index (D daughter)
1414+
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedTrkNoParams, "_1"); //! Prong1 index (Track daughter)
1415+
} // namespace hf_reso_3pr_trk
1416+
namespace hf_reso_dstar_trk
1417+
{
1418+
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRedDstarNoTrks, "_0"); //! Prong0 index (D daughter)
1419+
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedTrkNoParams, "_1"); //! Prong1 index (Track daughter)
1420+
} // namespace hf_reso_dstar_trk
1421+
namespace hf_reso_2pr_trk
1422+
{
1423+
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed2PrNoTrks, "_0"); //! Prong0 index (D daughter)
1424+
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedTrkNoParams, "_1"); //! Prong1 index (Track daughter)
1425+
} // namespace hf_reso_2pr_trk
14211426

14221427
DECLARE_SOA_TABLE(HfCandCharmReso, "AOD", "HFCANDCHARMRESO", //! Table with Resonance candidate information for resonances reduced workflow
14231428
o2::soa::Index<>,
@@ -1478,7 +1483,7 @@ DECLARE_SOA_TABLE(Hf3PrV0McRec, "AOD", "HF3PRV0MCREC",
14781483
hf_reso_cand_reduced::InvMassGen,
14791484
hf_cand::NTracksDecayed,
14801485
o2::soa::Marker<1>);
1481-
1486+
14821487
DECLARE_SOA_TABLE(HfDstarV0McRec, "AOD", "HFDSTARV0MCREC",
14831488
hf_reso_dstar_v0::Prong0Id,
14841489
hf_reso_dstar_v0::Prong1Id,

0 commit comments

Comments
 (0)