Update CMakeLists for new task

Author: scannito

PWGLF/TableProducer/Resonances/CMakeLists.txt

@@ -54,3 +54,8 @@ o2physics_add_dpl_workflow(cksspinalignment
     SOURCES cksspinalignment.cxx
     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
     COMPONENT_NAME Analysis)
+
+o2physics_add_dpl_workflow(resonance-tree-creator
+    SOURCES resonanceTreeCreator.cxx
+    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+    COMPONENT_NAME Analysis)

PWGLF/TableProducer/Resonances/resonanceTreeCreator.cxx

@@ -13,41 +13,38 @@
 /// \brief Produces a TTree with machine learning variables for resonances in the LF group
 /// \author Stefano Cannito (stefano.cannito@cern.ch)
 
-#include "Common/DataModel/EventSelection.h"
-
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-
-#include <Math/Vector4D.h>
-#include <TPDGCode.h>
-
-#include <algorithm>
-#include <array>
-#include <cmath>
-#include <cstdlib>
-#include <string>
-#include <utility>
-#include <vector>
-// #include "PWGLF/DataModel/LFResonanceMLTables.h"
 #include "PWGLF/DataModel/mcCentrality.h"
 #include "PWGLF/Utils/inelGt.h"
 
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TPDGCode.h>
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -97,6 +94,16 @@ DECLARE_SOA_COLUMN(Sign, sign, int8_t); //! Sign of the candidate
 DECLARE_SOA_COLUMN(IsPhi, isPhi, bool); //! Flag to indicate if the candidate is a phi meson
 } // namespace resomlcandidates
 
+DECLARE_SOA_TABLE(ResoCandidates, "AOD", "RESOCANDIDATES",
+                  resomlcandidates::M,
+                  resomlcandidates::Pt,
+                  resomlcandidates::P,
+                  resomlcandidates::Phi,
+                  resomlcandidates::Eta,
+                  resomlcandidates::Y,
+                  resomlcandidates::Sign,
+                  resomlcandidates::IsPhi);
+
 DECLARE_SOA_TABLE(ResoMLCandidates, "AOD", "RESOMLCANDIDATES",
                   resomlcandidates::MultClass,
                   resomlcandidates::PtDaughter1,
@@ -145,6 +152,7 @@ DECLARE_SOA_TABLE(ResoPhiMLSelection, "AOD", "RESOPHIMLSELECTION",
 
 struct resonanceTreeCreator {
   // Production of the TTree
+  Produces<aod::ResoCandidates> resoCandidates;
   Produces<aod::ResoMLCandidates> resoMLCandidates;
 
   // Configurables for track selection
@@ -171,8 +179,8 @@ struct resonanceTreeCreator {
   Partition<FullMCTracks> posMCTracks = aod::track::signed1Pt > cfgCutCharge;
   Partition<FullMCTracks> negMCTracks = aod::track::signed1Pt < cfgCutCharge;
 
-  // Cache for the tracks
-  SliceCache cache;
+  Preslice<aod::Tracks> perColl = aod::track::collisionId;
+  Preslice<aod::McParticles> perMCColl = aod::mcparticle::mcCollisionId;
 
   // Necessary to flag INEL>0 events in GenMC
   Service<o2::framework::O2DatabasePDG> pdgDB;
@@ -278,10 +286,6 @@ struct resonanceTreeCreator {
         return; // Skip filling if only background is requested and a phi candidate
     }
 
-    /*isPhi = (mcTrack1.pdgCode() == PDG_t::kKPlus && mcTrack2.pdgCode() == PDG_t::kKMinus &&
-             motherOfMcTrack1.pdgCode() == motherOfMcTrack2.pdgCode() && motherOfMcTrack1.pdgCode() == o2::constants::physics::Pdg::kPhi);
-  }*/
-
     resoMLCandidates(collision.centFT0M(),
                      track1.pt(), track1.p(), track1.phi(), track1.eta(), track1.rapidity(masstrack1), track1.dcaXY(), track1.dcaZ(),
                      track1.tpcNSigmaPi(), track1.tpcNSigmaKa(), track1.tofNSigmaPi(), track1.tofNSigmaKa(), tpctofPi1, tpctofKa1,
@@ -331,4 +335,4 @@ struct resonanceTreeCreator {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{adaptAnalysisTask<resonanceTreeCreator>(cfgc)};
-}
+}

PWGLF/Tasks/Strangeness/phik0shortanalysis.cxx

@@ -3409,7 +3409,9 @@ struct Phik0shortanalysis {
           continue; // condition to avoid double counting of pair
 
         ROOT::Math::PxPyPzMVector recPhi = recMother(track1, track2, massKa, massKa);
-        if (recPhi.Pt() < phiConfigs.minPhiPt || recPhi.Pt() > phiConfigs.maxPhiPt)
+        if (recPhi.Pt() < phiConfigs.minPhiPt)
+          continue;
+        if (recPhi.M() < phiConfigs.lowMPhi || recPhi.M() > phiConfigs.upMPhi)
           continue;
         if (std::abs(recPhi.Rapidity()) > deltaYConfigs.cfgYAcceptance)
           continue;