Skip to content

Commit ded7209

Browse files
authored
Merge pull request #11 from alibuild/alibot-cleanup-11776
[PWGJE] Please consider the following formatting changes to AliceO2Group#11776
2 parents ddce51f + 4dd17a7 commit ded7209

File tree

2 files changed

+277
-251
lines changed

2 files changed

+277
-251
lines changed

PWGJE/DataModel/GammaJetAnalysisTree.h

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,43 +17,45 @@
1717
#ifndef PWGJE_DATAMODEL_GAMMAJETANALYSISTREE_H_
1818
#define PWGJE_DATAMODEL_GAMMAJETANALYSISTREE_H_
1919

20-
#include "Framework/AnalysisDataModel.h"
21-
#include "PWGJE/DataModel/EMCALClusters.h"
2220
#include "PWGJE/Core/JetDerivedDataUtilities.h"
21+
#include "PWGJE/DataModel/EMCALClusters.h"
2322
#include "PWGJE/DataModel/Jet.h"
2423

25-
namespace o2::aod::gjanalysis{
26-
enum class ClusterOrigin{
27-
kUnknown = 0,
28-
kPhoton, // dominant amount of energy from the cluster is from a photon
29-
kPromptPhoton,
30-
kDirectPromptPhoton,
31-
kFragmentationPhoton,
32-
kDecayPhoton, // the particle that produced the cluster is a decay product
33-
kDecayPhotonPi0, // the cluster was produced by a pi0 decay
34-
kDecayPhotonEta, // the cluster was produced by a eta decay
35-
kMergedPi0, // the cluster was produced by a merged pi0, i.e. two photons contribute to the cluster that both come from pi0 decay
36-
kMergedEta, // the cluster was produced by a merged eta, i.e. two photons contribute to the cluster that both come from eta decay
37-
kConvertedPhoton, // the cluster was produced by a converted photon, i.e. a photon that converted to an electron-positron pair and one of the electrons was detected in the cluster
38-
};
39-
enum class ParticleOrigin{
40-
kUnknown = 0,
41-
kPromptPhoton,
42-
kDirectPromptPhoton,
43-
kFragmentationPhoton,
44-
kDecayPhoton,
45-
kDecayPhotonPi0,
46-
kDecayPhotonEta,
47-
kDecayPhotonOther,
48-
kPi0
49-
};
50-
}
24+
#include "Framework/AnalysisDataModel.h"
25+
26+
namespace o2::aod::gjanalysis
27+
{
28+
enum class ClusterOrigin {
29+
kUnknown = 0,
30+
kPhoton, // dominant amount of energy from the cluster is from a photon
31+
kPromptPhoton,
32+
kDirectPromptPhoton,
33+
kFragmentationPhoton,
34+
kDecayPhoton, // the particle that produced the cluster is a decay product
35+
kDecayPhotonPi0, // the cluster was produced by a pi0 decay
36+
kDecayPhotonEta, // the cluster was produced by a eta decay
37+
kMergedPi0, // the cluster was produced by a merged pi0, i.e. two photons contribute to the cluster that both come from pi0 decay
38+
kMergedEta, // the cluster was produced by a merged eta, i.e. two photons contribute to the cluster that both come from eta decay
39+
kConvertedPhoton, // the cluster was produced by a converted photon, i.e. a photon that converted to an electron-positron pair and one of the electrons was detected in the cluster
40+
};
41+
enum class ParticleOrigin {
42+
kUnknown = 0,
43+
kPromptPhoton,
44+
kDirectPromptPhoton,
45+
kFragmentationPhoton,
46+
kDecayPhoton,
47+
kDecayPhotonPi0,
48+
kDecayPhotonEta,
49+
kDecayPhotonOther,
50+
kPi0
51+
};
52+
} // namespace o2::aod::gjanalysis
5153
namespace o2::aod
5254
{
5355

5456
// Collision level information
5557
namespace gjevent
56-
{ //! event index
58+
{ //! event index
5759
DECLARE_SOA_COLUMN(Multiplicity, multiplicity, float);
5860
DECLARE_SOA_COLUMN(Centrality, centrality, float);
5961
DECLARE_SOA_COLUMN(Rho, rho, float);
@@ -70,7 +72,7 @@ namespace gjmcevent
7072
{
7173
DECLARE_SOA_INDEX_COLUMN(GjEvent, gjevent);
7274
DECLARE_SOA_COLUMN(Weight, weight, double);
73-
DECLARE_SOA_COLUMN(Rho, rho, float); // gen level rho
75+
DECLARE_SOA_COLUMN(Rho, rho, float); // gen level rho
7476
DECLARE_SOA_COLUMN(IsMultipleAssigned, isMultipleAssigned, bool); // if the corresponding MC collision matched to this rec collision was also matched to other rec collisions (allows to skip those on analysis level )
7577
} // namespace gjmcevent
7678
DECLARE_SOA_TABLE(GjMCEvents, "AOD", "GJMCEVENT", gjmcevent::GjEventId, gjmcevent::Weight, gjmcevent::Rho, gjmcevent::IsMultipleAssigned)
@@ -106,7 +108,6 @@ DECLARE_SOA_COLUMN(LeadingEnergyFraction, leadingEnergyFraction, float); // frac
106108
} // namespace gjgammamcinfo
107109
DECLARE_SOA_TABLE(GjGammaMCInfos, "AOD", "GJGAMMAMCINFO", gjgamma::GjEventId, gjgammamcinfo::Origin, gjgammamcinfo::LeadingEnergyFraction)
108110

109-
110111
// Generator level particle information from the MC collision that was matched to the reconstructed collision
111112
namespace gjmcparticle
112113
{
@@ -115,10 +116,10 @@ DECLARE_SOA_COLUMN(Energy, energy, float);
115116
DECLARE_SOA_COLUMN(Eta, eta, float);
116117
DECLARE_SOA_COLUMN(Phi, phi, float);
117118
DECLARE_SOA_COLUMN(Pt, pt, float);
118-
DECLARE_SOA_COLUMN(PdgCode, pdgCode, ushort); // TODO also add smoe origin of particle? maybe only save original pi0 and eta and photon (not decay photons)
119+
DECLARE_SOA_COLUMN(PdgCode, pdgCode, ushort); // TODO also add smoe origin of particle? maybe only save original pi0 and eta and photon (not decay photons)
119120
DECLARE_SOA_COLUMN(MCIsolation, mcIsolation, float); // isolation in cone on mc gen level
120-
DECLARE_SOA_COLUMN(Origin, origin, uint16_t); // origin of particle
121-
}
121+
DECLARE_SOA_COLUMN(Origin, origin, uint16_t); // origin of particle
122+
} // namespace gjmcparticle
122123
DECLARE_SOA_TABLE(GjMCParticles, "AOD", "GJMCPARTICLE", gjmcparticle::GjEventId, gjmcparticle::Energy, gjmcparticle::Eta, gjmcparticle::Phi, gjmcparticle::Pt, gjmcparticle::PdgCode, gjmcparticle::MCIsolation, gjmcparticle::Origin)
123124

124125
// Reconstructed charged jet information
@@ -161,4 +162,4 @@ DECLARE_SOA_TABLE(GjMCJets, "AOD", "GJMCJET", gjgamma::GjEventId, gjmcjet::Pt, g
161162

162163
} // namespace o2::aod
163164

164-
#endif // PWGJE_DATAMODEL_GAMMAJETANALYSISTREE_H_
165+
#endif // PWGJE_DATAMODEL_GAMMAJETANALYSISTREE_H_

0 commit comments

Comments
 (0)