Skip to content

Commit 7054eed

Browse files
committed
Please consider the following formatting changes
1 parent 00bb3d9 commit 7054eed

File tree

2 files changed

+34
-41
lines changed

2 files changed

+34
-41
lines changed

PWGJE/DataModel/SlimTables.h

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
#define PWGJE_DATAMODEL_SLIMTABLES_H_
2121

2222
#include "PWGJE/Core/JetDerivedDataUtilities.h"
23+
2324
#include <Framework/ASoA.h>
2425
#include <Framework/AnalysisDataModel.h>
2526

2627
#include <Rtypes.h>
2728

2829
#include <cstdint>
2930

30-
3131
namespace o2::aod
3232
{
3333

@@ -40,16 +40,16 @@ DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float);
4040
DECLARE_SOA_COLUMN(Weight, weight, float);
4141
DECLARE_SOA_COLUMN(EventSel, eventSel, uint16_t);
4242
DECLARE_SOA_COLUMN(TrackOccupancyInTimeRange, trackOccupancyInTimeRange, int);
43-
}
43+
} // namespace slimcollision
4444

4545
DECLARE_SOA_TABLE(SlimCollisions, "AOD", "SlimCollisions",
46-
o2::soa::Index<>,
47-
slimcollision::PosZ,
48-
slimcollision::CentFT0C,
49-
slimcollision::CentFT0M,
50-
slimcollision::Weight,
51-
slimcollision::EventSel,
52-
slimcollision::TrackOccupancyInTimeRange);
46+
o2::soa::Index<>,
47+
slimcollision::PosZ,
48+
slimcollision::CentFT0C,
49+
slimcollision::CentFT0M,
50+
slimcollision::Weight,
51+
slimcollision::EventSel,
52+
slimcollision::TrackOccupancyInTimeRange);
5353

5454
namespace slimmccollision
5555
{
@@ -59,16 +59,15 @@ DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float);
5959
DECLARE_SOA_COLUMN(Weight, weight, float);
6060
DECLARE_SOA_COLUMN(Accepted, accepted, uint64_t);
6161
DECLARE_SOA_COLUMN(PtHard, ptHard, float);
62-
}
62+
} // namespace slimmccollision
6363

6464
DECLARE_SOA_TABLE(SlimMcCollisions, "AOD", "SlimMcCollisions",
65-
o2::soa::Index<>,
66-
slimmccollision::PosZ,
67-
slimmccollision::CentFT0M,
68-
slimmccollision::Weight,
69-
slimmccollision::Accepted,
70-
slimmccollision::PtHard);
71-
65+
o2::soa::Index<>,
66+
slimmccollision::PosZ,
67+
slimmccollision::CentFT0M,
68+
slimmccollision::Weight,
69+
slimmccollision::Accepted,
70+
slimmccollision::PtHard);
7271

7372
namespace slimtracks
7473
{
@@ -87,8 +86,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz,
8786
DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy,
8887
[](float pt, float eta) -> float { return std::sqrt((pt * std::cosh(eta) * pt * std::cosh(eta)) + (jetderiveddatautilities::mPion * jetderiveddatautilities::mPion)); });
8988

90-
91-
}
89+
} // namespace slimtracks
9290
DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks",
9391
o2::soa::Index<>,
9492
slimtracks::CollisionId,
@@ -101,7 +99,6 @@ DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks",
10199
slimtracks::Pz<slimtracks::Pt, slimtracks::Eta>,
102100
slimtracks::Energy<slimtracks::Pt, slimtracks::Eta>);
103101

104-
105102
namespace slimparticles
106103
{
107104
DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollisionId);
@@ -118,19 +115,18 @@ DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz,
118115
[](float pt, float eta) -> float { return pt * std::sinh(eta); });
119116
DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy,
120117
[](float e) -> float { return e; });
121-
}
118+
} // namespace slimparticles
122119

123120
DECLARE_SOA_TABLE(SlimParticles, "AOD", "SlimParticles",
124-
o2::soa::Index<>,
125-
slimparticles::McCollisionId,
126-
slimparticles::Pt,
127-
slimparticles::Eta,
128-
slimparticles::Phi,
129-
slimparticles::Px<slimparticles::Pt, slimparticles::Phi>,
130-
slimparticles::Py<slimparticles::Pt, slimparticles::Phi>,
131-
slimparticles::Pz<slimparticles::Pt, slimparticles::Eta>,
132-
slimparticles::Energy<slimparticles::Pt, slimparticles::Eta>
133-
);
121+
o2::soa::Index<>,
122+
slimparticles::McCollisionId,
123+
slimparticles::Pt,
124+
slimparticles::Eta,
125+
slimparticles::Phi,
126+
slimparticles::Px<slimparticles::Pt, slimparticles::Phi>,
127+
slimparticles::Py<slimparticles::Pt, slimparticles::Phi>,
128+
slimparticles::Pz<slimparticles::Pt, slimparticles::Eta>,
129+
slimparticles::Energy<slimparticles::Pt, slimparticles::Eta>);
134130

135131
} // namespace o2::aod
136132

PWGJE/TableProducer/SlimTablesProducer.cxx

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
/// \brief Task to produce a reduced version of Tables for tracks, collisions, mcparticles and mccollisions.
1414
/// \author Millot Louise <[email protected]>
1515

16-
1716
#include "PWGJE/DataModel/SlimTables.h"
17+
1818
#include "Framework/AnalysisDataModel.h"
19-
#include "Framework/AnalysisTask.h"
2019
#include "Framework/AnalysisHelpers.h"
20+
#include "Framework/AnalysisTask.h"
2121
#include <Framework/Configurable.h>
2222
#include <Framework/InitContext.h>
2323
#include <Framework/Logger.h>
@@ -44,24 +44,23 @@ struct SlimTablesProducer {
4444
slimCollisions(coll.posZ(), coll.centFT0C(), coll.centFT0M(), coll.weight(), coll.eventSel(), coll.trackOccupancyInTimeRange());
4545
}
4646
}
47-
PROCESS_SWITCH(SlimTablesProducer, processCollision,"Produce slim collision table", true);
47+
PROCESS_SWITCH(SlimTablesProducer, processCollision, "Produce slim collision table", true);
4848

4949
void processMcCollision(aod::SlimMcCollisions const& mccollisions)
5050
{
5151
for (const auto& mccoll : mccollisions) {
5252
slimMcCollisions(mccoll.posZ(), mccoll.centFT0M(), mccoll.weight(), mccoll.accepted(), mccoll.ptHard());
5353
}
5454
}
55-
PROCESS_SWITCH(SlimTablesProducer, processMcCollision,"Produce slim mc collision table", true);
56-
55+
PROCESS_SWITCH(SlimTablesProducer, processMcCollision, "Produce slim mc collision table", true);
5756

5857
void processTracks(aod::SlimTracks const& tracks)
5958
{
6059
for (const auto& trk : tracks) {
61-
slimTracks(trk.collisionId(), trk.pt() , trk.eta(), trk.phi(), trk.dcaXY());
60+
slimTracks(trk.collisionId(), trk.pt(), trk.eta(), trk.phi(), trk.dcaXY());
6261
}
6362
}
64-
PROCESS_SWITCH(SlimTablesProducer, processTracks,"Produce slim track table", true);
63+
PROCESS_SWITCH(SlimTablesProducer, processTracks, "Produce slim track table", true);
6564

6665
void processParticles(aod::McParticles const& parts)
6766
{
@@ -70,12 +69,10 @@ struct SlimTablesProducer {
7069
}
7170
}
7271
PROCESS_SWITCH(SlimTablesProducer, processParticles, "produce slim particles", true);
73-
7472
};
7573

7674
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
7775
{
7876
return WorkflowSpec{
79-
adaptAnalysisTask<SlimTablesProducer>(cfgc)
80-
};
77+
adaptAnalysisTask<SlimTablesProducer>(cfgc)};
8178
}

0 commit comments

Comments
 (0)