2020// *
2121// *********************************************************
2222
23-
2423#ifndef PWGJE_TASKS_JETFORMATIONTIMERECLUSTERING_H_
2524#define PWGJE_TASKS_JETFORMATIONTIMERECLUSTERING_H_
2625
2928#include " PWGJE/DataModel/Jet.h" // IWYU pragma: keep
3029#include " PWGJE/DataModel/JetReducedData.h"
3130#include " PWGJE/DataModel/JetReducedDataDQ.h"
32-
33- #include " PWGJE/DataModel/JetSubstructure.h" // new
31+ #include " PWGJE/DataModel/JetSubstructure.h" // new
3432
3533#include < Framework/ASoA.h>
3634
4038
4139namespace o2 ::aod
4240{
43- // new part
41+ // new part
4442namespace jetTFsubstructure
4543{ // !
4644DECLARE_SOA_COLUMN (EnergyMother, energyMother, std::vector<float >); // !
@@ -59,10 +57,10 @@ DECLARE_SOA_COLUMN(TauFormg, tauFormg, std::vector<float>); //!
5957} // namespace jetTFsubstructure
6058
6159// all tables have the same content (for now)
62- DECLARE_SOA_TABLE (CJetTFSSs, " AOD" , " CJETTFSS" , jetoutput::JetPt, jetoutput::JetPhi, jetoutput::JetEta, jetTFsubstructure::EnergyMother, jetTFsubstructure::PtLeading, jetTFsubstructure::PtSubLeading, jetTFsubstructure::Theta, jetTFsubstructure::PtLeadingConstituent, jetTFsubstructure::TauForm, jetTFsubstructure::Z, jetTFsubstructure::Ptg, jetTFsubstructure::Thetag, jetTFsubstructure::Zg, jetTFsubstructure::TauFormg); \
63- DECLARE_SOA_TABLE (CMCDJetTFSSs, " AOD" , " CMCDJETTFSS" , jetoutput::JetPt, jetoutput::JetPhi, jetoutput::JetEta, jetTFsubstructure::EnergyMother, jetTFsubstructure::PtLeading, jetTFsubstructure::PtSubLeading, jetTFsubstructure::Theta, jetTFsubstructure::PtLeadingConstituent, jetTFsubstructure::TauForm, jetTFsubstructure::Z, jetTFsubstructure::Ptg, jetTFsubstructure::Thetag, jetTFsubstructure::Zg, jetTFsubstructure::TauFormg); \
64- DECLARE_SOA_TABLE (CMCPJetTFSSs, " AOD" , " CMCPJETTFSS" , jetoutput::JetPt, jetoutput::JetPhi, jetoutput::JetEta, jetTFsubstructure::EnergyMother, jetTFsubstructure::PtLeading, jetTFsubstructure::PtSubLeading, jetTFsubstructure::Theta, jetTFsubstructure::PtLeadingConstituent, jetTFsubstructure::TauForm, jetTFsubstructure::Z, jetTFsubstructure::Ptg, jetTFsubstructure::Thetag, jetTFsubstructure::Zg, jetTFsubstructure::TauFormg); \
65- DECLARE_SOA_TABLE (CEWSJetTFSSs, " AOD" , " CEWSJETTFSS" , jetoutput::JetPt, jetoutput::JetPhi, jetoutput::JetEta, jetTFsubstructure::EnergyMother, jetTFsubstructure::PtLeading, jetTFsubstructure::PtSubLeading, jetTFsubstructure::Theta, jetTFsubstructure::PtLeadingConstituent, jetTFsubstructure::TauForm, jetTFsubstructure::Z, jetTFsubstructure::Ptg, jetTFsubstructure::Thetag, jetTFsubstructure::Zg, jetTFsubstructure::TauFormg); \
60+ DECLARE_SOA_TABLE (CJetTFSSs, " AOD" , " CJETTFSS" , jetoutput::JetPt, jetoutput::JetPhi, jetoutput::JetEta, jetTFsubstructure::EnergyMother, jetTFsubstructure::PtLeading, jetTFsubstructure::PtSubLeading, jetTFsubstructure::Theta, jetTFsubstructure::PtLeadingConstituent, jetTFsubstructure::TauForm, jetTFsubstructure::Z, jetTFsubstructure::Ptg, jetTFsubstructure::Thetag, jetTFsubstructure::Zg, jetTFsubstructure::TauFormg);
61+ DECLARE_SOA_TABLE (CMCDJetTFSSs, " AOD" , " CMCDJETTFSS" , jetoutput::JetPt, jetoutput::JetPhi, jetoutput::JetEta, jetTFsubstructure::EnergyMother, jetTFsubstructure::PtLeading, jetTFsubstructure::PtSubLeading, jetTFsubstructure::Theta, jetTFsubstructure::PtLeadingConstituent, jetTFsubstructure::TauForm, jetTFsubstructure::Z, jetTFsubstructure::Ptg, jetTFsubstructure::Thetag, jetTFsubstructure::Zg, jetTFsubstructure::TauFormg);
62+ DECLARE_SOA_TABLE (CMCPJetTFSSs, " AOD" , " CMCPJETTFSS" , jetoutput::JetPt, jetoutput::JetPhi, jetoutput::JetEta, jetTFsubstructure::EnergyMother, jetTFsubstructure::PtLeading, jetTFsubstructure::PtSubLeading, jetTFsubstructure::Theta, jetTFsubstructure::PtLeadingConstituent, jetTFsubstructure::TauForm, jetTFsubstructure::Z, jetTFsubstructure::Ptg, jetTFsubstructure::Thetag, jetTFsubstructure::Zg, jetTFsubstructure::TauFormg);
63+ DECLARE_SOA_TABLE (CEWSJetTFSSs, " AOD" , " CEWSJETTFSS" , jetoutput::JetPt, jetoutput::JetPhi, jetoutput::JetEta, jetTFsubstructure::EnergyMother, jetTFsubstructure::PtLeading, jetTFsubstructure::PtSubLeading, jetTFsubstructure::Theta, jetTFsubstructure::PtLeadingConstituent, jetTFsubstructure::TauForm, jetTFsubstructure::Z, jetTFsubstructure::Ptg, jetTFsubstructure::Thetag, jetTFsubstructure::Zg, jetTFsubstructure::TauFormg);
6664
6765} // namespace o2::aod
6866
@@ -207,7 +205,7 @@ struct FormationTimeReclustering {
207205 }
208206 splittingTable (jet.globalIndex (), tracks, clusters, candidates, parentSubJet2.perp (), parentSubJet2.eta (), parentSubJet2.phi (), 0 );
209207 auto z = parentSubJet2.perp () / (parentSubJet1.perp () + parentSubJet2.perp ());
210- auto theta = parentSubJet1.delta_R (parentSubJet2); // this is deltaR - divide by R in postprocessing
208+ auto theta = parentSubJet1.delta_R (parentSubJet2); // this is deltaR - divide by R in postprocessing
211209 auto tau = (parentSubJet1.perp () + parentSubJet2.perp ()) / (parentSubJet1.perp () * parentSubJet2.perp () * theta * theta); // as in run2 aliphysics
212210 energyMotherVec.push_back (daughterSubJet.e ());
213211 ptLeadingVec.push_back (parentSubJet1.pt ());
0 commit comments