[PWGJE] Enhance GammaJetAnalysisTree with additional MC information

PWGJE/DataModel/GammaJetAnalysisTree.h

@@ -9,9 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-///
+/// \file GammaJetAnalysisTree.h
 /// \brief Table definitions for gamma-jet analyses
-///
 /// \author Florian Jonas <florian.jonas@cern.ch>
 
 #ifndef PWGJE_DATAMODEL_GAMMAJETANALYSISTREE_H_
@@ -71,7 +70,7 @@
 // Information about the MC collision that was matched to the reconstructed collision
 namespace gjmcevent
 {
 DECLARE_SOA_INDEX_COLUMN(GjEvent, gjevent);
 DECLARE_SOA_COLUMN(Weight, weight, double);
 DECLARE_SOA_COLUMN(Rho, rho, float);                              // gen level rho
 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   )
@@ -80,7 +79,7 @@
 // Information about EMCal clusters
 namespace gjgamma
 {
 DECLARE_SOA_INDEX_COLUMN(GjEvent, gjevent);                            //! event index
 DECLARE_SOA_COLUMN(Energy, energy, float);                             //! cluster energy (GeV)
 DECLARE_SOA_COLUMN(Definition, definition, int);                       //! cluster definition, see EMCALClusterDefinition.h
 DECLARE_SOA_COLUMN(Eta, eta, float);                                   //! cluster pseudorapidity (calculated using vertex)
@@ -91,12 +90,12 @@
 DECLARE_SOA_COLUMN(Time, time, float);                                 //! cluster time (ns)
 DECLARE_SOA_COLUMN(IsExotic, isExotic, bool);                          //! flag to mark cluster as exotic
 DECLARE_SOA_COLUMN(DistanceToBadChannel, distanceToBadChannel, float); //! distance to bad channel
 DECLARE_SOA_COLUMN(NLM, nlm, ushort);                                  //! number of local maxima
 DECLARE_SOA_COLUMN(IsoRaw, isoraw, float);                             //! isolation in cone not corrected for Rho
 DECLARE_SOA_COLUMN(PerpConeRho, perpconerho, float);                   //! rho in perpendicular cone
 DECLARE_SOA_COLUMN(TMdeltaPhi, tmdeltaphi, float);                     //! delta phi between cluster and closest match
 DECLARE_SOA_COLUMN(TMdeltaEta, tmdeltaeta, float);                     //! delta eta between cluster and closest match
 DECLARE_SOA_COLUMN(TMtrackP, tmtrackp, float);                         //! track momentum of closest match, -1 if no match found
 } // namespace gjgamma
 DECLARE_SOA_TABLE(GjGammas, "AOD", "GJGAMMA",
                   gjgamma::GjEventId, gjgamma::Energy, gjgamma::Definition, gjgamma::Eta, gjgamma::Phi, gjgamma::M02, gjgamma::M20, gjgamma::NCells, gjgamma::Time, gjgamma::IsExotic, gjgamma::DistanceToBadChannel, gjgamma::NLM, gjgamma::IsoRaw, gjgamma::PerpConeRho, gjgamma::TMdeltaPhi, gjgamma::TMdeltaEta, gjgamma::TMtrackP)
@@ -106,13 +105,21 @@
 {
 DECLARE_SOA_COLUMN(Origin, origin, uint16_t);
 DECLARE_SOA_COLUMN(LeadingEnergyFraction, leadingEnergyFraction, float); // fraction of energy from the leading MC particle
+// further information about the particle that produced this cluster, one could also linnk to mcgen particle table
+// but for now this is easier as the MCgen table is filtered and I do not want to deal with ensuring the filered table exists and
+// does not filter out a mother
+DECLARE_SOA_COLUMN(Eta, eta, float);
+DECLARE_SOA_COLUMN(Phi, phi, float);
+DECLARE_SOA_COLUMN(Energy, energy, float);
+DECLARE_SOA_COLUMN(Pt, pt, float);
+DECLARE_SOA_COLUMN(MCIso, mcIso, float);
 } // namespace gjgammamcinfo
-DECLARE_SOA_TABLE(GjGammaMCInfos, "AOD", "GJGAMMAMCINFO", gjgamma::GjEventId, gjgammamcinfo::Origin, gjgammamcinfo::LeadingEnergyFraction)
+DECLARE_SOA_TABLE(GjGammaMCInfos, "AOD", "GJGAMMAMCINFO", gjgamma::GjEventId, gjgammamcinfo::Origin, gjgammamcinfo::LeadingEnergyFraction, gjgammamcinfo::Eta, gjgammamcinfo::Phi, gjgammamcinfo::Energy, gjgammamcinfo::Pt, gjgammamcinfo::MCIso)
 
 // Generator level particle information from the MC collision that was matched to the reconstructed collision
 namespace gjmcparticle
 {
 DECLARE_SOA_INDEX_COLUMN(GjEvent, gjevent);
 DECLARE_SOA_COLUMN(Energy, energy, float);
 DECLARE_SOA_COLUMN(Eta, eta, float);
 DECLARE_SOA_COLUMN(Phi, phi, float);
@@ -178,6 +185,16 @@
 } // namespace gjmcjet
 DECLARE_SOA_TABLE(GjMCJets, "AOD", "GJMCJET", gjgamma::GjEventId, gjmcjet::Pt, gjmcjet::Eta, gjmcjet::Phi, gjmcjet::Radius, gjmcjet::Energy, gjmcjet::Mass, gjmcjet::Area, gjmcjet::PerpConeRho)
 
+// MC gen level substructure
+namespace gjmcjetsubstructure
+{
+DECLARE_SOA_COLUMN(EnergyMother, energyMother, std::vector<float>); //! energy of mother subjet at each splitting
+DECLARE_SOA_COLUMN(PtLeading, ptLeading, std::vector<float>);       //! pt of leading subjet at each splitting
+DECLARE_SOA_COLUMN(PtSubLeading, ptSubLeading, std::vector<float>); //! pt of subleading subjet at each splitting
+DECLARE_SOA_COLUMN(Theta, theta, std::vector<float>);               //! opening angle theta at each splitting
+} // namespace gjmcjetsubstructure
+DECLARE_SOA_TABLE(GjMCJetSubstructures, "AOD", "GJMCJETSUBSTR", gjgamma::GjEventId, gjmcjetsubstructure::EnergyMother, gjmcjetsubstructure::PtLeading, gjmcjetsubstructure::PtSubLeading, gjmcjetsubstructure::Theta)
+
 } // namespace o2::aod
 
 #endif // PWGJE_DATAMODEL_GAMMAJETANALYSISTREE_H_