diff --git a/PWGJE/Tasks/jetLundPlane.cxx b/PWGJE/Tasks/jetLundPlane.cxx index 80be0959a97..d6b6eb8d7a8 100644 --- a/PWGJE/Tasks/jetLundPlane.cxx +++ b/PWGJE/Tasks/jetLundPlane.cxx @@ -13,39 +13,38 @@ /// \brief Task for jet Lund plane. Creates histograms for offline unfolding (including QA histos), and optionally tables. /// \author Zoltan Varga -#include -#include -#include -#include -#include +#include "PWGJE/Core/FastJetUtilities.h" +#include "PWGJE/Core/JetFinder.h" +#include "PWGJE/DataModel/Jet.h" +#include "PWGJE/DataModel/JetReducedData.h" -#include "Framework/AnalysisTask.h" #include "Framework/AnalysisDataModel.h" +#include "Framework/AnalysisTask.h" #include "Framework/HistogramRegistry.h" #include "Framework/runDataProcessing.h" -#include "PWGJE/Core/JetFinder.h" -#include "PWGJE/Core/FastJetUtilities.h" -#include "PWGJE/DataModel/Jet.h" -#include "PWGJE/DataModel/JetReducedData.h" - #include -#include #include +#include + +#include +#include +#include +#include +#include using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions; - // Mini-AOD (tables) namespace o2::aod { -DECLARE_SOA_COLUMN(MiniCollId, miniCollId, uint64_t); // collision global index -DECLARE_SOA_COLUMN(MiniJetId, miniJetId, uint64_t); // jet global index (within its table) -DECLARE_SOA_COLUMN(Level, level, uint8_t); // 0=reco(det), 1=truth(part) -DECLARE_SOA_COLUMN(JetRint, jetRint, int32_t); // jet.r() as stored (int R*100) +DECLARE_SOA_COLUMN(MiniCollId, miniCollId, uint64_t); // collision global index +DECLARE_SOA_COLUMN(MiniJetId, miniJetId, uint64_t); // jet global index (within its table) +DECLARE_SOA_COLUMN(Level, level, uint8_t); // 0=reco(det), 1=truth(part) +DECLARE_SOA_COLUMN(JetRint, jetRint, int32_t); // jet.r() as stored (int R*100) DECLARE_SOA_COLUMN(JetPt, jetPt, float); DECLARE_SOA_COLUMN(JetEta, jetEta, float); DECLARE_SOA_COLUMN(JetPhi, jetPhi, float); @@ -74,7 +73,6 @@ DECLARE_SOA_TABLE(MiniJetMatches, "AOD", "MINIMCH", MiniCollId, DetJetId, PartJetId, MatchDR, MatchRelPt); } // namespace o2::aod - namespace { constexpr float kTiny = 1e-12f; @@ -221,8 +219,7 @@ std::vector primaryDeclusteringSplittings(fastjet::PseudoJet jetCA } // namespace -struct JetLundPlaneUnfolding -{ +struct JetLundPlaneUnfolding { // Config Configurable vertexZCut{"vertexZCut", 10.f, "|z_vtx| cut"}; Configurable jetPtMin{"jetPtMin", 20.f, "min reco jet pT"}; @@ -367,11 +364,11 @@ struct JetLundPlaneUnfolding // Type aliases using RecoJets = soa::Join; using DetJetsMatched = soa::Join; + aod::ChargedMCDetectorLevelJetConstituents, + aod::ChargedMCDetectorLevelJetsMatchedToChargedMCParticleLevelJets>; using PartJetsMatched = soa::Join; + aod::ChargedMCParticleLevelJetConstituents, + aod::ChargedMCParticleLevelJetsMatchedToChargedMCDetectorLevelJets>; template bool passJetFiducial(JetT const& jet, int rWanted) const @@ -669,4 +666,4 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{ adaptAnalysisTask(cfgc, TaskName{"jet-lund-plane"})}; -} \ No newline at end of file +}