Skip to content

Commit 2f0617c

Browse files
authored
Merge pull request #1 from alibuild/alibot-cleanup-15536
Please consider the following formatting changes to #15536
2 parents 7a556a5 + 45b23eb commit 2f0617c

File tree

1 file changed

+22
-25
lines changed

1 file changed

+22
-25
lines changed

PWGJE/Tasks/jetLundPlane.cxx

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,39 +13,38 @@
1313
/// \brief Task for jet Lund plane. Creates histograms for offline unfolding (including QA histos), and optionally tables.
1414
/// \author Zoltan Varga <zoltan.varga@cern.ch>
1515

16-
#include <cmath>
17-
#include <vector>
18-
#include <algorithm>
19-
#include <array>
20-
#include <unordered_map>
16+
#include "PWGJE/Core/FastJetUtilities.h"
17+
#include "PWGJE/Core/JetFinder.h"
18+
#include "PWGJE/DataModel/Jet.h"
19+
#include "PWGJE/DataModel/JetReducedData.h"
2120

22-
#include "Framework/AnalysisTask.h"
2321
#include "Framework/AnalysisDataModel.h"
22+
#include "Framework/AnalysisTask.h"
2423
#include "Framework/HistogramRegistry.h"
2524
#include "Framework/runDataProcessing.h"
2625

27-
#include "PWGJE/Core/JetFinder.h"
28-
#include "PWGJE/Core/FastJetUtilities.h"
29-
#include "PWGJE/DataModel/Jet.h"
30-
#include "PWGJE/DataModel/JetReducedData.h"
31-
3226
#include <THnSparse.h>
3327

34-
#include <fastjet/PseudoJet.hh>
3528
#include <fastjet/ClusterSequenceArea.hh>
29+
#include <fastjet/PseudoJet.hh>
30+
31+
#include <algorithm>
32+
#include <array>
33+
#include <cmath>
34+
#include <unordered_map>
35+
#include <vector>
3636

3737
using namespace o2;
3838
using namespace o2::framework;
3939
using namespace o2::framework::expressions;
4040

41-
4241
// Mini-AOD (tables)
4342
namespace o2::aod
4443
{
45-
DECLARE_SOA_COLUMN(MiniCollId, miniCollId, uint64_t); // collision global index
46-
DECLARE_SOA_COLUMN(MiniJetId, miniJetId, uint64_t); // jet global index (within its table)
47-
DECLARE_SOA_COLUMN(Level, level, uint8_t); // 0=reco(det), 1=truth(part)
48-
DECLARE_SOA_COLUMN(JetRint, jetRint, int32_t); // jet.r() as stored (int R*100)
44+
DECLARE_SOA_COLUMN(MiniCollId, miniCollId, uint64_t); // collision global index
45+
DECLARE_SOA_COLUMN(MiniJetId, miniJetId, uint64_t); // jet global index (within its table)
46+
DECLARE_SOA_COLUMN(Level, level, uint8_t); // 0=reco(det), 1=truth(part)
47+
DECLARE_SOA_COLUMN(JetRint, jetRint, int32_t); // jet.r() as stored (int R*100)
4948
DECLARE_SOA_COLUMN(JetPt, jetPt, float);
5049
DECLARE_SOA_COLUMN(JetEta, jetEta, float);
5150
DECLARE_SOA_COLUMN(JetPhi, jetPhi, float);
@@ -74,7 +73,6 @@ DECLARE_SOA_TABLE(MiniJetMatches, "AOD", "MINIMCH",
7473
MiniCollId, DetJetId, PartJetId, MatchDR, MatchRelPt);
7574
} // namespace o2::aod
7675

77-
7876
namespace
7977
{
8078
constexpr float kTiny = 1e-12f;
@@ -221,8 +219,7 @@ std::vector<SplittingObs> primaryDeclusteringSplittings(fastjet::PseudoJet jetCA
221219

222220
} // namespace
223221

224-
struct JetLundPlaneUnfolding
225-
{
222+
struct JetLundPlaneUnfolding {
226223
// Config
227224
Configurable<float> vertexZCut{"vertexZCut", 10.f, "|z_vtx| cut"};
228225
Configurable<float> jetPtMin{"jetPtMin", 20.f, "min reco jet pT"};
@@ -367,11 +364,11 @@ struct JetLundPlaneUnfolding
367364
// Type aliases
368365
using RecoJets = soa::Join<aod::ChargedJets, aod::ChargedJetConstituents>;
369366
using DetJetsMatched = soa::Join<aod::ChargedMCDetectorLevelJets,
370-
aod::ChargedMCDetectorLevelJetConstituents,
371-
aod::ChargedMCDetectorLevelJetsMatchedToChargedMCParticleLevelJets>;
367+
aod::ChargedMCDetectorLevelJetConstituents,
368+
aod::ChargedMCDetectorLevelJetsMatchedToChargedMCParticleLevelJets>;
372369
using PartJetsMatched = soa::Join<aod::ChargedMCParticleLevelJets,
373-
aod::ChargedMCParticleLevelJetConstituents,
374-
aod::ChargedMCParticleLevelJetsMatchedToChargedMCDetectorLevelJets>;
370+
aod::ChargedMCParticleLevelJetConstituents,
371+
aod::ChargedMCParticleLevelJetsMatchedToChargedMCDetectorLevelJets>;
375372

376373
template <typename JetT>
377374
bool passJetFiducial(JetT const& jet, int rWanted) const
@@ -669,4 +666,4 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
669666
{
670667
return WorkflowSpec{
671668
adaptAnalysisTask<JetLundPlaneUnfolding>(cfgc, TaskName{"jet-lund-plane"})};
672-
}
669+
}

0 commit comments

Comments
 (0)