Skip to content

Commit d1e353d

Browse files
yakparoyakparo
authored
Merge pull request #9 from alibuild/alibot-cleanup-18677
Please consider the following formatting changes to #18677
2 parents 4318160 + 88cef53 commit d1e353d

6 files changed

Lines changed: 51 additions & 53 deletions

File tree

‎PWGCF/Femto/Core/closeTripletRejection.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ class CloseTripletRejectionTrackTrackSigma0
258258
bool isClose12 = mCtrTrack12.isClosePair(track1, track2, trackTable, tripletHistManager);
259259
bool isClose1Sigma0 = mCtrTrack1Sigma0.isClosePair(track1, sigma0, trackTable, tripletHistManager);
260260
bool isClose2Sigma0 = mCtrTrack2Sigma0.isClosePair(track2, sigma0, trackTable, tripletHistManager);
261-
return isClose12 || isClose1Sigma0|| isClose2Sigma0;
261+
return isClose12 || isClose1Sigma0 || isClose2Sigma0;
262262
}
263263

264264
private:

‎PWGCF/Femto/Core/sigma0HistManager.h‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
#include "PWGCF/Femto/Core/histManager.h"
2020
#include "PWGCF/Femto/Core/modes.h"
21+
#include "PWGCF/Femto/Core/photonHistManager.h"
2122
#include "PWGCF/Femto/Core/trackHistManager.h"
2223
#include "PWGCF/Femto/Core/v0HistManager.h"
23-
#include "PWGCF/Femto/Core/photonHistManager.h"
2424

2525
#include <CommonConstants/MathConstants.h>
2626
#include <Framework/Configurable.h>
@@ -158,29 +158,29 @@ constexpr std::array<histmanager::HistInfo<Sigma0Hist>, kSigma0HistLast> HistTab
158158
{kTruePtVsPt, {(conf).pt, (conf).pt}}, \
159159
{kTrueEtaVsEta, {(conf).eta, (conf).eta}}, \
160160
{kTruePhiVsPhi, {(conf).phi, (conf).phi}}, \
161-
{kPdg, {(conf).pdgCodes}},
161+
{kPdg, {(conf).pdgCodes}},
162162

163163
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
164-
#define SIGMA0_HIST_QA_MAP(confAnalysis, confQa) \
165-
{kCosPa, {(confQa).cosPa}}, \
166-
{kDecayVtxX, {(confQa).decayVertex}}, \
167-
{kDecayVtxY, {(confQa).decayVertex}}, \
168-
{kDecayVtxZ, {(confQa).decayVertex}}, \
169-
{kDecayVtx, {(confQa).decayVertex}}, \
170-
{kPtVsEta, {(confAnalysis).pt, (confAnalysis).eta}}, \
171-
{kPtVsPhi, {(confAnalysis).pt, (confAnalysis).phi}}, \
172-
{kPhiVsEta, {(confAnalysis).phi, (confAnalysis).eta}}, \
173-
{kPtVsCosPa, {(confAnalysis).pt, (confQa).cosPa}}, \
174-
{kMassSigma0, {(confQa).massSigma0}}, \
175-
{kMassAntiSigma0, {(confQa).massAntiSigma0}}, \
176-
{kPtVsSigma0Mass, {(confAnalysis).pt, (confQa).massSigma0}}, \
177-
{kPtVsAntiSigma0Mass, {(confAnalysis).pt, (confQa).massAntiSigma0}}, \
164+
#define SIGMA0_HIST_QA_MAP(confAnalysis, confQa) \
165+
{kCosPa, {(confQa).cosPa}}, \
166+
{kDecayVtxX, {(confQa).decayVertex}}, \
167+
{kDecayVtxY, {(confQa).decayVertex}}, \
168+
{kDecayVtxZ, {(confQa).decayVertex}}, \
169+
{kDecayVtx, {(confQa).decayVertex}}, \
170+
{kPtVsEta, {(confAnalysis).pt, (confAnalysis).eta}}, \
171+
{kPtVsPhi, {(confAnalysis).pt, (confAnalysis).phi}}, \
172+
{kPhiVsEta, {(confAnalysis).phi, (confAnalysis).eta}}, \
173+
{kPtVsCosPa, {(confAnalysis).pt, (confQa).cosPa}}, \
174+
{kMassSigma0, {(confQa).massSigma0}}, \
175+
{kMassAntiSigma0, {(confQa).massAntiSigma0}}, \
176+
{kPtVsSigma0Mass, {(confAnalysis).pt, (confQa).massSigma0}}, \
177+
{kPtVsAntiSigma0Mass, {(confAnalysis).pt, (confQa).massAntiSigma0}}, \
178178
{kSigma0MassVsAntiSigma0Mass, {(confQa).massSigma0, (confQa).massAntiSigma0}},
179179

180180
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
181-
#define SIGMA0_HIST_MC_QA_MAP(confAnalysis, confQa) \
182-
{kNoMcParticle, {(confAnalysis).pt, (confQa).cosPa}}, \
183-
{kPrimary, {(confAnalysis).pt, (confQa).cosPa}},
181+
#define SIGMA0_HIST_MC_QA_MAP(confAnalysis, confQa) \
182+
{kNoMcParticle, {(confAnalysis).pt, (confQa).cosPa}}, \
183+
{kPrimary, {(confAnalysis).pt, (confQa).cosPa}},
184184

185185
template <typename T>
186186
auto makeSigma0HistSpecMap(const T& confBinningAnalysis)
@@ -237,7 +237,7 @@ class Sigma0HistManager
237237
Sigma0HistManager() = default;
238238
~Sigma0HistManager() = default;
239239

240-
// minimal init
240+
// minimal init
241241
template <modes::Mode mode, typename T1>
242242
void init(o2::framework::HistogramRegistry* registry,
243243
std::map<Sigma0Hist, std::vector<o2::framework::AxisSpec>> const& Sigma0Specs,
@@ -273,7 +273,7 @@ class Sigma0HistManager
273273
this->initQa(Sigma0Specs);
274274
}
275275
}
276-
276+
277277
// init with qa + lambda and photon managers
278278
template <modes::Mode mode, typename T1, typename T2, typename T3, typename T4>
279279
void init(o2::framework::HistogramRegistry* registry,
@@ -296,18 +296,18 @@ class Sigma0HistManager
296296
void fill(T1 const& sigma0candidate)
297297
{
298298
if constexpr (modes::isFlagSet(mode, modes::Mode::kReco)) {
299-
this->fillAnalysis(sigma0candidate);
300-
}
299+
this->fillAnalysis(sigma0candidate);
300+
}
301301
if constexpr (modes::isFlagSet(mode, modes::Mode::kQa)) {
302-
this->fillQa(sigma0candidate);
302+
this->fillQa(sigma0candidate);
303303
}
304304
}
305305

306-
// wrapper for tripletProcessHelpers
306+
// wrapper for tripletProcessHelpers
307307
template <modes::Mode mode, typename T1, typename T2>
308308
void fill(T1 const& sigma0candidate, T2 const& tracks)
309309
{
310-
this->fillAnalysis(sigma0candidate);
310+
this->fillAnalysis(sigma0candidate);
311311
}
312312

313313
// fill sigma0 + lambda + photon
@@ -333,7 +333,7 @@ class Sigma0HistManager
333333
template <modes::Mode mode, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
334334
void fill(T1 const& sigma0candidate, T2 const& trackTable, T3 const& col, T4 const& mcParticles, T5 const& mcMothers, T6 const& mcPartonicMothers)
335335
{
336-
this->template fillMc<mode>(sigma0candidate, col, mcParticles, mcMothers, mcPartonicMothers);
336+
this->template fillMc<mode>(sigma0candidate, col, mcParticles, mcMothers, mcPartonicMothers);
337337
}
338338
// fill mc + lambda + photon
339339
template <modes::Mode mode, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>

‎PWGCF/Femto/Core/tripletBuilder.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
#include "PWGCF/Femto/Core/modes.h"
2424
#include "PWGCF/Femto/Core/pairHistManager.h"
2525
#include "PWGCF/Femto/Core/particleCleaner.h"
26+
#include "PWGCF/Femto/Core/sigma0HistManager.h"
2627
#include "PWGCF/Femto/Core/trackHistManager.h"
2728
#include "PWGCF/Femto/Core/tripletCleaner.h"
2829
#include "PWGCF/Femto/Core/tripletHistManager.h"
2930
#include "PWGCF/Femto/Core/tripletProcessHelpers.h"
3031
#include "PWGCF/Femto/Core/v0HistManager.h"
31-
#include "PWGCF/Femto/Core/sigma0HistManager.h"
3232
#include "PWGCF/Femto/DataModel/FemtoTables.h"
3333

3434
#include <Framework/HistogramRegistry.h>
@@ -1284,7 +1284,6 @@ class TripletTrackTrackSigma0Builder
12841284
std::uniform_int_distribution<> mDist;
12851285
};
12861286

1287-
12881287
// builder for triplets of generated particles (mc truth only, kMc without kReco)
12891288
// covers all triplet types, since e.g. a lambda is just another mc particle
12901289
template <auto& prefixMcParticle1,

‎PWGCF/Femto/DataModel/FemtoTables.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,8 +1347,8 @@ using StoredFSigmaPlusPcmExtras = StoredFSigmaPlusPcmExtras_001;
13471347
namespace femtosigma0s
13481348
{
13491349
DECLARE_SOA_COLUMN(Mask, mask, o2::analysis::femto::datatypes::Sigma0MaskType); //! Bitmask for track selections
1350-
DECLARE_SOA_INDEX_COLUMN_FULL(Lambda, lambda, int32_t, FLambdas, "_lambda"); ///< row in FLambdas
1351-
DECLARE_SOA_INDEX_COLUMN_FULL(Photon, photon, int32_t, FPhotons, "_photon"); ///< row in FPhotons
1350+
DECLARE_SOA_INDEX_COLUMN_FULL(Lambda, lambda, int32_t, FLambdas, "_lambda"); ///< row in FLambdas
1351+
DECLARE_SOA_INDEX_COLUMN_FULL(Photon, photon, int32_t, FPhotons, "_photon"); ///< row in FPhotons
13521352
// id columns for Lambda daughter tracks
13531353
DECLARE_SOA_INDEX_COLUMN_FULL(PosDau, posDau, int32_t, FTracks, "_PosDau"); //! index column for positive daughter track
13541354
DECLARE_SOA_INDEX_COLUMN_FULL(NegDau, negDau, int32_t, FTracks, "_NegDau"); //! index column for negative daughter track
@@ -1378,18 +1378,18 @@ DECLARE_SOA_INDEX_COLUMN_FULL(Photon, photon, int32_t, FLitePhotons, "_photon");
13781378

13791379
// Same collision index column as FLambdas/FPhotons, so Sigma0s can be sliced by femto collision
13801380
DECLARE_SOA_TABLE_STAGED_VERSIONED(FSigma0s_001, "FSIGMA0", 1,
1381-
o2::soa::Index<>,
1382-
femtobase::stored::FColId,
1383-
femtobase::stored::SignedPt,
1384-
femtobase::stored::Eta,
1385-
femtobase::stored::Phi,
1386-
femtobase::stored::Mass,
1387-
femtosigma0s::LambdaId,
1388-
femtosigma0s::PosDauId,
1389-
femtosigma0s::NegDauId,
1390-
femtosigma0s::PhotonId,
1391-
femtobase::dynamic::Pt<femtobase::stored::SignedPt>,
1392-
femtobase::dynamic::Sign<femtobase::stored::SignedPt>);
1381+
o2::soa::Index<>,
1382+
femtobase::stored::FColId,
1383+
femtobase::stored::SignedPt,
1384+
femtobase::stored::Eta,
1385+
femtobase::stored::Phi,
1386+
femtobase::stored::Mass,
1387+
femtosigma0s::LambdaId,
1388+
femtosigma0s::PosDauId,
1389+
femtosigma0s::NegDauId,
1390+
femtosigma0s::PhotonId,
1391+
femtobase::dynamic::Pt<femtobase::stored::SignedPt>,
1392+
femtobase::dynamic::Sign<femtobase::stored::SignedPt>);
13931393
using FSigma0s = FSigma0s_001;
13941394

13951395
DECLARE_SOA_TABLE_STAGED_VERSIONED(FSigma0Masks_001, "FSIGMA0MASK", 1, //! sigma0 masks

‎PWGCF/Femto/TableProducer/femtoSigma0Producer.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,3 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
5757
{
5858
return WorkflowSpec{adaptAnalysisTask<FemtoSigma0Producer>(cfgc)};
5959
}
60-

‎PWGCF/Femto/Tasks/femtoTripletTrackTrackSigma0.cxx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
#include "PWGCF/Femto/Core/pairCleaner.h"
2222
#include "PWGCF/Femto/Core/particleCleaner.h"
2323
#include "PWGCF/Femto/Core/partitions.h"
24+
#include "PWGCF/Femto/Core/photonHistManager.h"
25+
#include "PWGCF/Femto/Core/sigma0Builder.h"
26+
#include "PWGCF/Femto/Core/sigma0HistManager.h"
2427
#include "PWGCF/Femto/Core/trackBuilder.h"
2528
#include "PWGCF/Femto/Core/trackHistManager.h"
2629
#include "PWGCF/Femto/Core/tripletBuilder.h"
2730
#include "PWGCF/Femto/Core/tripletHistManager.h"
28-
#include "PWGCF/Femto/Core/sigma0Builder.h"
29-
#include "PWGCF/Femto/Core/sigma0HistManager.h"
3031
#include "PWGCF/Femto/Core/v0HistManager.h"
31-
#include "PWGCF/Femto/Core/photonHistManager.h"
3232
#include "PWGCF/Femto/DataModel/FemtoTables.h"
3333

3434
#include <Framework/ASoA.h>
@@ -44,8 +44,8 @@
4444
#include <Framework/runDataProcessing.h>
4545

4646
#include <map>
47-
#include <vector>
4847
#include <string>
48+
#include <vector>
4949

5050
using namespace o2::analysis::femto;
5151

@@ -80,8 +80,8 @@ struct FemtoTripletTrackTrackSigma0 {
8080
trackhistmanager::ConfTrackBinning1 confTrackBinning1;
8181
trackbuilder::ConfTrackSelection2 confTrackSelections2;
8282
trackhistmanager::ConfTrackBinning2 confTrackBinning2;
83-
inline static constexpr std::string_view PrefixTrack1 = "Track1/";
84-
inline static constexpr std::string_view PrefixTrack2 = "Track2/";
83+
inline static constexpr std::string_view PrefixTrack1 = "Track1/";
84+
inline static constexpr std::string_view PrefixTrack2 = "Track2/";
8585

8686
// particle cleaners (mc only)
8787
particlecleaner::ConfTrackCleaner1 confTrackCleaner1;
@@ -98,9 +98,9 @@ struct FemtoTripletTrackTrackSigma0 {
9898

9999
// setup for photon and lambda
100100
v0histmanager::ConfLambdaBinning1 confLambdaBinning;
101-
inline static constexpr std::string_view PrefixPhoton = "Sigma0/DauPhoton/";
101+
inline static constexpr std::string_view PrefixPhoton = "Sigma0/DauPhoton/";
102102
photonhistmanager::ConfPhotonBinning confPhotonBinning;
103-
inline static constexpr std::string_view PrefixLambda = "Sigma0/DauLambda/";
103+
inline static constexpr std::string_view PrefixLambda = "Sigma0/DauLambda/";
104104

105105
// setup sigma0s
106106
sigma0builder::ConfSigma0SelectionDefault confSigma0Selection;

0 commit comments

Comments
 (0)