[PWGJE] Adding Ds and Xic to jet framework

PWGJE/Core/JetCandidateUtilities.h

@@ -1,4 +1,4 @@
 // Copyright 2019-2020 CERN and copyright holders of ALICE O2.
 // See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
 // All rights not expressly granted are reserved.
 //
@@ -146,7 +146,7 @@
   if (!particle.has_daughters()) {
     return false;
   }
   for (auto daughter : particle.template daughters_as<typename std::decay_t<T>::parent_t>()) {
     if (daughter.globalIndex() == globalIndex) {
       return true;
     }
@@ -205,11 +205,11 @@
  * @param candidate candidate that is being checked
  * @param table the table to be sliced
  */
-template <typename T, typename U, typename V, typename M, typename N, typename O, typename P, typename Q, typename R>
-auto slicedPerCandidate(T const& table, U const& candidate, V const& perD0Candidate, M const& perDplusCandidate, N const& perDstarCandidate, O const& perLcCandidate, P const& perB0Candidate, Q const& perBplusCandidate, R const& perDielectronCandidate)
+template <typename T, typename U, typename V, typename M, typename N, typename O, typename P, typename Q, typename R, typename S, typename A>
+auto slicedPerCandidate(T const& table, U const& candidate, V const& perD0Candidate, M const& perDplusCandidate, N const& perDsCandidate, O const& perDstarCandidate, P const& perLcCandidate, Q const& perB0Candidate, R const& perBplusCandidate, S const& perXicToXiPiPiCandidate, A const& perDielectronCandidate)
 {
   if constexpr (jethfutilities::isHFCandidate<U>()) {
-    return jethfutilities::slicedPerHFCandidate(table, candidate, perD0Candidate, perDplusCandidate, perDstarCandidate, perLcCandidate, perB0Candidate, perBplusCandidate);
+    return jethfutilities::slicedPerHFCandidate(table, candidate, perD0Candidate, perDplusCandidate, perDsCandidate, perDstarCandidate, perLcCandidate, perB0Candidate, perBplusCandidate, perXicToXiPiPiCandidate);
   } else if constexpr (jetdqutilities::isDielectronCandidate<U>()) {
     return jetdqutilities::slicedPerDielectronCandidate(table, candidate, perDielectronCandidate);
   } else {
@@ -223,11 +223,11 @@
  * @param jet jet that the slice is based on
  * @param table the table to be sliced
  */
-template <typename CandidateTable, typename T, typename U, typename V, typename M, typename N, typename O, typename P, typename Q, typename R>
-auto slicedPerJet(T const& table, U const& jet, V const& perD0Jet, M const& perDplusJet, N const& perDstarJet, O const& perLcJet, P const& perB0Jet, Q const& perBplusJet, R const& perDielectronJet)
+template <typename CandidateTable, typename T, typename U, typename V, typename M, typename N, typename O, typename P, typename Q, typename R, typename S, typename A>
+auto slicedPerJet(T const& table, U const& jet, V const& perD0Jet, M const& perDplusJet, N const& perDsJet, O const& perDstarJet, P const& perLcJet, Q const& perB0Jet, R const& perBplusJet, S const& perXicToXiPiPiJet, A const& perDielectronJet)
 {
   if constexpr (jethfutilities::isHFTable<CandidateTable>() || jethfutilities::isHFMcTable<CandidateTable>()) {
-    return jethfutilities::slicedPerHFJet<CandidateTable>(table, jet, perD0Jet, perDplusJet, perDstarJet, perLcJet, perB0Jet, perBplusJet);
+    return jethfutilities::slicedPerHFJet<CandidateTable>(table, jet, perD0Jet, perDplusJet, perDsJet, perDstarJet, perLcJet, perB0Jet, perBplusJet, perXicToXiPiPiJet);
   } else if constexpr (jetdqutilities::isDielectronTable<CandidateTable>() || jetdqutilities::isDielectronMcTable<CandidateTable>()) {
     return jetdqutilities::slicedPerDielectronJet<CandidateTable>(table, jet, perDielectronJet);
   } else {

PWGJE/DataModel/Jet.h

@@ -1,4 +1,4 @@
 // Copyright 2019-2020 CERN and copyright holders of ALICE O2.
 // See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
 // All rights not expressly granted are reserved.
 //
@@ -18,7 +18,7 @@
 ///
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>
 /// \author Jochen Klein <jochen.klein@cern.ch>
 /// \author Raymond Ehlers <raymond.ehlers@cern.ch>, ORNL
 
 #ifndef PWGJE_DATAMODEL_JET_H_
 #define PWGJE_DATAMODEL_JET_H_
@@ -43,8 +43,8 @@
 
 namespace jet
 {
 DECLARE_SOA_INDEX_COLUMN(JCollision, collision);
 DECLARE_SOA_INDEX_COLUMN(JMcCollision, mcCollision);
 DECLARE_SOA_COLUMN(Pt, pt, float);         //!
 DECLARE_SOA_COLUMN(Eta, eta, float);       //!
 DECLARE_SOA_COLUMN(Phi, phi, float);       //!
@@ -86,11 +86,11 @@
                     jet::Pz<jet::Pt, jet::Eta>,                                                     \
                     jet::P<jet::Pt, jet::Eta>,                                                      \
                     _name_##util::Dummy##_jet_type_##s<>);                                          \
   namespace _name_##matchingGeo                                                                     \
   {                                                                                                 \
     DECLARE_SOA_ARRAY_INDEX_COLUMN_FULL(_jet_type_, matchedJetGeo, int32_t, _jet_type_##s, "_geo"); \
   }                                                                                                 \
   namespace _name_##matchingPt                                                                      \
   {                                                                                                 \
     DECLARE_SOA_ARRAY_INDEX_COLUMN_FULL(_jet_type_, matchedJetPt, int32_t, _jet_type_##s, "_pt");   \
   }                                                                                                 \
@@ -104,7 +104,7 @@
   {                                                                                              \
     DECLARE_SOA_INDEX_COLUMN(_jet_type_, jet);                                                   \
     DECLARE_SOA_ARRAY_INDEX_COLUMN(_track_type_, tracks);                                        \
     DECLARE_SOA_ARRAY_INDEX_COLUMN(JCluster, clusters);                                          \
     DECLARE_SOA_ARRAY_INDEX_COLUMN_FULL(Candidates, candidates, int32_t, _cand_type_, "_cand");  \
   }                                                                                              \
   DECLARE_SOA_TABLE(_jet_type_##Constituents, "AOD", _Description_ "C",                          \
@@ -181,10 +181,12 @@
 DECLARE_JET_TABLES_LEVELS(Neutral, JTrackSub, HfD0Bases, HfD0PBases, "N");
 DECLARE_JET_TABLES_LEVELS(D0Charged, JTrackD0Sub, HfD0Bases, HfD0PBases, "D0");
 DECLARE_JET_TABLES_LEVELS(DplusCharged, JTrackDplusSub, HfDplusBases, HfDplusPBases, "DP");
+DECLARE_JET_TABLES_LEVELS(DsCharged, JTrackDsSub, HfDsBases, HfDsPBases, "DS");
 DECLARE_JET_TABLES_LEVELS(DstarCharged, JTrackDstarSub, HfDstarBases, HfDstarPBases, "DST");
 DECLARE_JET_TABLES_LEVELS(LcCharged, JTrackLcSub, HfLcBases, HfLcPBases, "Lc");
 DECLARE_JET_TABLES_LEVELS(B0Charged, JTrackB0Sub, HfB0Bases, HfB0PBases, "B0");
 DECLARE_JET_TABLES_LEVELS(BplusCharged, JTrackBplusSub, HfBplusBases, HfBplusPBases, "BP");
+DECLARE_JET_TABLES_LEVELS(XicToXiPiPiCharged, JTrackXicToXiPiPiSub, HfXicToXiPiPiBases, HfXicToXiPiPiPBases, "XICXPP");
 DECLARE_JET_TABLES_LEVELS(V0Charged, JTrackSub, V0Cores, JV0Mcs, "V0");
 DECLARE_JET_TABLES_LEVELS(DielectronCharged, JTrackSub, Dielectrons, JDielectronMcs, "DIEL");
 
@@ -231,6 +233,14 @@
 using McCollisionsDplus = o2::soa::Join<HfDplusMcCollBases, JDplusMcCollisionIds>;
 using CandidatesDplusMCP = o2::soa::Join<HfDplusPBases, JDplusPIds>;
 
+using CollisionsDs = o2::soa::Join<HfDsCollBases, JDsCollisionIds>;
+using CandidatesDsData = o2::soa::Join<HfDsBases, HfDsPars, HfDsParEs, HfDsSels, HfDsMls, JDsIds>;
+using CandidatesDsMCD = o2::soa::Join<HfDsBases, HfDsPars, HfDsParEs, HfDsSels, HfDsMls, HfDsMcs, JDsIds>;
+using JetTracksSubDs = JTrackDsSubs;
+using JetParticlesSubDs = JMcParticleDsSubs;
+using McCollisionsDs = o2::soa::Join<HfDsMcCollBases, JDsMcCollisionIds>;
+using CandidatesDsMCP = o2::soa::Join<HfDsPBases, JDsPIds>;
+
 using CollisionsDstar = o2::soa::Join<HfDstarCollBases, JDstarCollisionIds>;
 using CandidatesDstarData = o2::soa::Join<HfDstarBases, HfDstarPars, HfDstarParD0s, HfDstarSels, HfDstarMls, JDstarIds>;
 using CandidatesDstarMCD = o2::soa::Join<HfDstarBases, HfDstarPars, HfDstarParD0s, HfDstarSels, HfDstarMls, HfDstarMcs, JDstarIds>;
@@ -263,6 +273,14 @@
 using McCollisionsBplus = o2::soa::Join<HfBplusMcCollBases, JBplusMcCollisionIds>;
 using CandidatesBplusMCP = o2::soa::Join<HfBplusPBases, JBplusPIds>;
 
+using CollisionsXicToXiPiPi = o2::soa::Join<HfXicToXiPiPiCollBases, JXicToXiPiPiCollisionIds>;
+using CandidatesXicToXiPiPiData = o2::soa::Join<HfXicToXiPiPiBases, HfXicToXiPiPiPars, HfXicToXiPiPiParEs, HfXicToXiPiPiSels, HfXicToXiPiPiMls, JXicToXiPiPiIds>;
+using CandidatesXicToXiPiPiMCD = o2::soa::Join<HfXicToXiPiPiBases, HfXicToXiPiPiPars, HfXicToXiPiPiParEs, HfXicToXiPiPiSels, HfXicToXiPiPiMls, HfXicToXiPiPiMcs, JXicToXiPiPiIds>;
+using JetTracksSubXicToXiPiPi = JTrackXicToXiPiPiSubs;
+using JetParticlesSubXicToXiPiPi = JMcParticleXicToXiPiPiSubs;
+using McCollisionsXicToXiPiPi = o2::soa::Join<HfXicToXiPiPiMcCollBases, JXicToXiPiPiMcCollisionIds>;
+using CandidatesXicToXiPiPiMCP = o2::soa::Join<HfXicToXiPiPiPBases, JXicToXiPiPiPIds>;
+
 using CandidatesV0Data = o2::soa::Join<V0Cores, JV0Ids, V0SignalFlags>;
 using CandidatesV0MCD = o2::soa::Join<V0Cores, V0MCCores, JV0Ids, V0SignalFlags>;
 // using V0Daughters = DauTrackExtras;

PWGJE/DataModel/JetReducedDataHF.h

@@ -37,6 +37,8 @@ constexpr uint JMarkerBplus = 4;
 constexpr uint JMarkerDielectron = 5;
 constexpr uint JMarkerDstar = 6;
 constexpr uint JMarkerB0 = 7;
+constexpr uint JMarkerDs = 8;
+constexpr uint JMarkerXicToXiPiPi = 9;
 
 namespace jcandidateindices
 {
@@ -124,6 +126,46 @@ DECLARE_SOA_TABLE(JDumDplusMlDaus, "AOD", "JDUMDPMLDAU",
 
 // might have to update!!!!!!!!!!!!!!!!!!!!!!
 
+namespace jdsindices
+{
+DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, JTracks, "_0");
+DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, JTracks, "_1");
+DECLARE_SOA_INDEX_COLUMN_FULL(Prong2, prong2, int, JTracks, "_2");
+} // namespace jdsindices
+
+DECLARE_SOA_TABLE_STAGED(JDsCollisionIds, "JDSCOLLID",
+                         jcandidateindices::JCollisionId,
+                         o2::soa::Marker<JMarkerDs>);
+
+DECLARE_SOA_TABLE_STAGED(JDsMcCollisionIds, "JDSMCCOLLID",
+                         jcandidateindices::JMcCollisionId,
+                         o2::soa::Marker<JMarkerDs>);
+
+DECLARE_SOA_TABLE_STAGED(JDsIds, "JDSID",
+                         jcandidateindices::JCollisionId,
+                         jdsindices::Prong0Id,
+                         jdsindices::Prong1Id,
+                         jdsindices::Prong2Id);
+
+DECLARE_SOA_TABLE_STAGED(JDsPIds, "JDSPID",
+                         jcandidateindices::JMcCollisionId,
+                         jcandidateindices::JMcParticleId,
+                         o2::soa::Marker<JMarkerDs>);
+
+namespace jdummyds
+{
+
+DECLARE_SOA_COLUMN(DummyDs, dummyDs, bool);
+
+} // namespace jdummyds
+DECLARE_SOA_TABLE(JDumDsParDaus, "AOD", "JDUMDSPARDAU",
+                  jdummyds::DummyDs,
+                  o2::soa::Marker<1>);
+
+DECLARE_SOA_TABLE(JDumDsMlDaus, "AOD", "JDUMDSMLDAU",
+                  jdummyds::DummyDs,
+                  o2::soa::Marker<2>);
+
 namespace jdstarindices
 {
 DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, JTracks, "_0");
@@ -258,6 +300,49 @@ DECLARE_SOA_TABLE_STAGED(JBplusPIds, "JBPPID",
                          jcandidateindices::JMcParticleId,
                          o2::soa::Marker<JMarkerBplus>);
 
+namespace jxictoxipipiindices
+{
+DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, JTracks, "_0");
+DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, JTracks, "_1");
+DECLARE_SOA_INDEX_COLUMN_FULL(Prong2, prong2, int, JTracks, "_2");
+DECLARE_SOA_INDEX_COLUMN_FULL(Prong3, prong3, int, JTracks, "_3");
+DECLARE_SOA_INDEX_COLUMN_FULL(Prong4, prong4, int, JTracks, "_4");
+} // namespace jxictoxipipiindices
+
+DECLARE_SOA_TABLE_STAGED(JXicToXiPiPiCollisionIds, "JXICXPPCOLLID",
+                         jcandidateindices::JCollisionId,
+                         o2::soa::Marker<JMarkerXicToXiPiPi>);
+
+DECLARE_SOA_TABLE_STAGED(JXicToXiPiPiMcCollisionIds, "JXICXPPMCCOLLID",
+                         jcandidateindices::JMcCollisionId,
+                         o2::soa::Marker<JMarkerXicToXiPiPi>);
+
+DECLARE_SOA_TABLE_STAGED(JXicToXiPiPiIds, "JXICXPPID",
+                         jcandidateindices::JCollisionId,
+                         jxictoxipipiindices::Prong0Id,
+                         jxictoxipipiindices::Prong1Id,
+                         jxictoxipipiindices::Prong2Id,
+                         jxictoxipipiindices::Prong3Id,
+                         jxictoxipipiindices::Prong4Id);
+
+DECLARE_SOA_TABLE_STAGED(JXicToXiPiPiPIds, "JXICXPPPID",
+                         jcandidateindices::JMcCollisionId,
+                         jcandidateindices::JMcParticleId,
+                         o2::soa::Marker<JMarkerXicToXiPiPi>);
+
+namespace jdummyxictoxipipi
+{
+DECLARE_SOA_COLUMN(DummyXicToXiPiPi, dummyXicToXiPiPi, bool);
+
+} // namespace jdummyxictoxipipi
+DECLARE_SOA_TABLE(JDumXicToXiPiPiParDaus, "AOD", "JDUMXICXPPPARDAU",
+                  jdummyxictoxipipi::DummyXicToXiPiPi,
+                  o2::soa::Marker<1>);
+
+DECLARE_SOA_TABLE(JDumXicToXiPiPiMlDaus, "AOD", "JDUMXICXPPMLDAU",
+                  jdummyxictoxipipi::DummyXicToXiPiPi,
+                  o2::soa::Marker<2>);
+
 } // namespace o2::aod
 
 #endif // PWGJE_DATAMODEL_JETREDUCEDDATAHF_H_

PWGJE/DataModel/JetSubstructure.h

@@ -260,10 +260,12 @@ DECLARE_SOA_COLUMN(JetNConstituents, jetNConstituents, int); //!
 JETSUBSTRUCTURE_TABLES_DEF(C, "C", Charged, charged, JTracks, CJetCOs, "CJETCO", JTrackSubs, CEWSJetCOs, "CEWSJETCO", JTracks, CMCDJetCOs, "CMCDJETCO", JMcParticles, CMCPJetCOs, "CMCPJETCO");
 JETSUBSTRUCTURE_TABLES_DEF(D0C, "D0C", D0Charged, d0charged, JTracks, HfD0Bases, "HFD0BASE", JTrackD0Subs, HfD0Bases, "HFD0BASE", JTracks, HfD0Bases, "HFD0BASE", JMcParticles, HfD0PBases, "HFD0PBASE");
 JETSUBSTRUCTURE_TABLES_DEF(DplusC, "DPC", DplusCharged, dpluscharged, JTracks, HfDplusBases, "HFDPBASE", JTrackDplusSubs, HfDplusBases, "HFDPBASE", JTracks, HfDplusBases, "HFDPBASE", JMcParticles, HfDplusPBases, "HFDPPBASE");
+JETSUBSTRUCTURE_TABLES_DEF(DsC, "DSC", DsCharged, dscharged, JTracks, HfDsBases, "HFDSBASE", JTrackDsSubs, HfDsBases, "HFDSBASE", JTracks, HfDsBases, "HFDSBASE", JMcParticles, HfDsPBases, "HFDSPBASE");
 JETSUBSTRUCTURE_TABLES_DEF(DstarC, "DSTC", DstarCharged, dstarcharged, JTracks, HfDstarBases, "HFDSTBASE", JTrackDstarSubs, HfDstarBases, "HFDSTBASE", JTracks, HfDstarBases, "HFDSTBASE", JMcParticles, HfDstarPBases, "HFDSTPBASE");
 JETSUBSTRUCTURE_TABLES_DEF(LcC, "LCC", LcCharged, lccharged, JTracks, HfLcBases, "HFLCBASE", JTrackLcSubs, HfLcBases, "HFLCBASE", JTracks, HfLcBases, "HFLCBASE", JMcParticles, HfLcPBases, "HFLCPBASE");
 JETSUBSTRUCTURE_TABLES_DEF(B0C, "B0C", B0Charged, b0charged, JTracks, HfB0Bases, "HFB0BASE", JTrackB0Subs, HfB0Bases, "HFB0BASE", JTracks, HfB0Bases, "HFB0BASE", JMcParticles, HfB0PBases, "HFB0PBASE");
 JETSUBSTRUCTURE_TABLES_DEF(BplusC, "BPC", BplusCharged, bpluscharged, JTracks, HfBplusBases, "HFBPBASE", JTrackBplusSubs, HfBplusBases, "HFBPBASE", JTracks, HfBplusBases, "HFBPBASE", JMcParticles, HfBplusPBases, "HFBPPBASE");
+JETSUBSTRUCTURE_TABLES_DEF(XicToXiPiPiC, "XICXPPC", XicToXiPiPiCharged, xictoxipipicharged, JTracks, HfXicToXiPiPiBases, "HFXICXPPBASE", JTrackXicToXiPiPiSubs, HfXicToXiPiPiBases, "HFXICXPPBASE", JTracks, HfXicToXiPiPiBases, "HFXICXPPBASE", JMcParticles, HfXicToXiPiPiPBases, "HFXICXPPPBASE");
 JETSUBSTRUCTURE_TABLES_DEF(DielectronC, "DIELC", DielectronCharged, dielectroncharged, JTracks, Dielectrons, "RTDIELECTRON", JTrackDielectronSubs, Dielectrons, "RTDIELECTRON", JTracks, Dielectrons, "RTDIELECTRON", JMcParticles, JDielectronMcs, "JDIELMC");
 
 } // namespace o2::aod