Fixing pluralization of table names in DataModel. This was silently introducing an error in AO2D merging, due to the previous way my local aod-writer was written. Now fixed using local o2-aod-merger tests.

Author: cmuncinelli

PWGLF/DataModel/lambdaJetPolarizationIons.h

@@ -88,7 +88,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(LeadParticlePz, leadParticlePz, //! Leading particle
                            [](float leadParticlePt, float leadParticleEta) -> float { return leadParticlePt * std::sinh(leadParticleEta); });
 } // namespace lambdajetpol
 
-DECLARE_SOA_TABLE(RingCollisions, "AOD", "RINGCOLLISIONS",
+DECLARE_SOA_TABLE(RingCollisions, "AOD", "RINGCOLLISION",
                   o2::soa::Index<>, // self-index: auto-assigned row number
                   lambdajetpol::CentFT0M,
                   lambdajetpol::CentFT0C,
@@ -99,7 +99,7 @@ namespace lambdajetpol
 DECLARE_SOA_INDEX_COLUMN(RingCollision, ringCollision); // Declare index after table is available
 } // namespace lambdajetpol
 
-DECLARE_SOA_TABLE(RingJets, "AOD", "RINGJETS",
+DECLARE_SOA_TABLE(RingJets, "AOD", "RINGJET",
                   lambdajetpol::RingCollisionId, // relational index -> RingCollisions
                   lambdajetpol::JetPt,
                   lambdajetpol::JetEta,
@@ -110,7 +110,7 @@ DECLARE_SOA_TABLE(RingJets, "AOD", "RINGJETS",
                   lambdajetpol::JetPy<lambdajetpol::JetPt, lambdajetpol::JetPhi>,
                   lambdajetpol::JetPz<lambdajetpol::JetPt, lambdajetpol::JetEta>);
 
-DECLARE_SOA_TABLE(RingLeadP, "AOD", "RINGLEADP",
+DECLARE_SOA_TABLE(RingLeadPs, "AOD", "RINGLEADP",
                   lambdajetpol::RingCollisionId,
                   lambdajetpol::LeadParticlePt,
                   lambdajetpol::LeadParticleEta,
@@ -120,7 +120,7 @@ DECLARE_SOA_TABLE(RingLeadP, "AOD", "RINGLEADP",
                   lambdajetpol::LeadParticlePy<lambdajetpol::LeadParticlePt, lambdajetpol::LeadParticlePhi>,
                   lambdajetpol::LeadParticlePz<lambdajetpol::LeadParticlePt, lambdajetpol::LeadParticleEta>);
 
-DECLARE_SOA_TABLE(RingLaV0s, "AOD", "RINGLAV0S",
+DECLARE_SOA_TABLE(RingLaV0s, "AOD", "RINGLAV0",
                   lambdajetpol::RingCollisionId,
                   lambdajetpol::V0Pt,
                   lambdajetpol::V0Eta,

PWGLF/TableProducer/Strangeness/lambdaJetPolarizationIons.cxx

@@ -156,7 +156,7 @@ struct lambdajetpolarizationions {
   // } products;
   Produces<o2::aod::RingLaV0s> tableV0s;
   Produces<o2::aod::RingJets> tableJets;
-  Produces<o2::aod::RingLeadP> tableLeadParticles;
+  Produces<o2::aod::RingLeadPs> tableLeadParticles;
   Produces<o2::aod::RingCollisions> tableCollisions;
 
   // Define histogram registries:
@@ -274,7 +274,7 @@ struct lambdajetpolarizationions {
     Configurable<std::string> phiHighCut{"phiHighCut", "0.1/x+pi/18.0+0.06", "High azimuth cut parametrisation"};
 
     // PID (TPC/TOF)
-    Configurable<float> tpcPidNsigmaCut{"tpcPidNsigmaCut", 3, "tpcPidNsigmaCut"}; // Default is 5. Reduced to agree with strangenessInJetsIons
+    Configurable<float> tpcPidNsigmaCut{"tpcPidNsigmaCut", 4, "tpcPidNsigmaCut"}; // Default is 5
     Configurable<float> tofPidNsigmaCutLaPr{"tofPidNsigmaCutLaPr", 1e+6, "tofPidNsigmaCutLaPr"};
     Configurable<float> tofPidNsigmaCutLaPi{"tofPidNsigmaCutLaPi", 1e+6, "tofPidNsigmaCutLaPi"};
 

PWGLF/Tasks/Strangeness/lambdaJetPolarizationIonsDerived.cxx

@@ -432,9 +432,9 @@ struct lambdajetpolarizationionsderived {
   // (TODO: test using custom grouping)
   Preslice<aod::RingJets> perColJets = o2::aod::lambdajetpol::ringCollisionId;
   Preslice<aod::RingLaV0s> perColV0s = o2::aod::lambdajetpol::ringCollisionId;
-  Preslice<aod::RingLeadP> perColLeadPs = o2::aod::lambdajetpol::ringCollisionId;
+  Preslice<aod::RingLeadPs> perColLeadPs = o2::aod::lambdajetpol::ringCollisionId;
   void processPolarizationData(o2::aod::RingCollisions const& collisions, o2::aod::RingJets const& jets, o2::aod::RingLaV0s const& v0s,
-                               o2::aod::RingLeadP const& leadPs)
+                               o2::aod::RingLeadPs const& leadPs)
   {
     for (auto const& collision : collisions) {
       const auto collId = collision.globalIndex(); // The self-index accessor