PWGEM/Dilepton: update charged track for 2PC

dsekihat · dsekihat · commit 7caa7817eb69 · 2025-07-26T18:03:17.000+02:00
diff --git a/PWGEM/Dilepton/DataModel/dileptonTables.h b/PWGEM/Dilepton/DataModel/dileptonTables.h
@@ -690,22 +690,24 @@ using EMGlobalMuonSelfId = EMGlobalMuonSelfIds::iterator;
 
 namespace emprimarytrack
 {
-DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent);        //!
-DECLARE_SOA_COLUMN(CollisionId, collisionId, int); //!
-DECLARE_SOA_COLUMN(TrackId, trackId, int);         //!
-DECLARE_SOA_COLUMN(Sign, sign, int8_t);            //!
-DECLARE_SOA_COLUMN(TrackBit, trackBit, uint16_t);  //!
-DECLARE_SOA_DYNAMIC_COLUMN(Signed1Pt, signed1Pt, [](float pt, int8_t sign) -> float { return sign * 1. / pt; });
-DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) -> float { return pt * std::cosh(eta); });
-DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) -> float { return pt * std::cos(phi); });
-DECLARE_SOA_DYNAMIC_COLUMN(Py, py, [](float pt, float phi) -> float { return pt * std::sin(phi); });
-DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) -> float { return pt * std::sinh(eta); });
+DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent); //!
+// DECLARE_SOA_COLUMN(CollisionId, collisionId, int); //!
+DECLARE_SOA_COLUMN(TrackId, trackId, int); //!
+// DECLARE_SOA_COLUMN(Sign, sign, int8_t);            //!
+DECLARE_SOA_COLUMN(TrackBit, trackBit, uint16_t); //!
+DECLARE_SOA_COLUMN(PtUINT16, ptuint16, uint16_t); //!
+DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt, [](uint16_t ptuint16) -> float { return static_cast<float>(ptuint16) * 1e-4; });
+// DECLARE_SOA_DYNAMIC_COLUMN(Signed1Pt, signed1Pt, [](float pt, int8_t sign) -> float { return sign * 1. / pt; });
+// DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) -> float { return pt * std::cosh(eta); });
+// DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) -> float { return pt * std::cos(phi); });
+// DECLARE_SOA_DYNAMIC_COLUMN(Py, py, [](float pt, float phi) -> float { return pt * std::sin(phi); });
+// DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) -> float { return pt * std::sinh(eta); });
 } // namespace emprimarytrack
 
 DECLARE_SOA_TABLE_VERSIONED(EMPrimaryTracks_000, "AOD", "EMPRIMARYTRACK", 0, //!
-                            o2::soa::Index<>, emprimarytrack::CollisionId,
-                            emprimarytrack::TrackId, emprimarytrack::Sign,
-                            track::Pt, track::Eta, track::Phi, track::DcaXY, track::DcaZ, emprimarytrack::TrackBit,
+                            o2::soa::Index<>,                                // emprimarytrack::CollisionId,
+                            emprimarytrack::TrackId,                         // emprimarytrack::Sign,
+                            emprimarytrack::PtUINT16, track::Eta, track::Phi, track::DcaXY, track::DcaZ, emprimarytrack::TrackBit,
 
                             // track::TPCNClsFindable, track::TPCNClsFindableMinusFound, track::TPCNClsFindableMinusCrossedRows, track::TPCNClsShared, track::TPCChi2NCl,
                             // track::ITSClusterSizes, track::ITSChi2NCl, track::DetectorMap,
@@ -719,11 +721,12 @@ DECLARE_SOA_TABLE_VERSIONED(EMPrimaryTracks_000, "AOD", "EMPRIMARYTRACK", 0, //!
                             // track::v001::ITSClusterMap<track::ITSClusterSizes>, track::v001::ITSNCls<track::ITSClusterSizes>, track::v001::ITSNClsInnerBarrel<track::ITSClusterSizes>,
 
                             // track::HasITS<track::DetectorMap>, track::HasTPC<track::DetectorMap>, track::HasTRD<track::DetectorMap>, track::HasTOF<track::DetectorMap>,
-                            emprimarytrack::Signed1Pt<track::Pt, emprimarytrack::Sign>,
-                            emprimarytrack::P<track::Pt, track::Eta>,
-                            emprimarytrack::Px<track::Pt, track::Phi>,
-                            emprimarytrack::Py<track::Pt, track::Phi>,
-                            emprimarytrack::Pz<track::Pt, track::Eta>);
+                            // emprimarytrack::Signed1Pt<track::Pt, emprimarytrack::Sign>,
+                            // emprimarytrack::P<track::Pt, track::Eta>,
+                            // emprimarytrack::Px<track::Pt, track::Phi>,
+                            // emprimarytrack::Py<track::Pt, track::Phi>,
+                            // emprimarytrack::Pz<track::Pt, track::Eta>
+                            emprimarytrack::Pt<emprimarytrack::PtUINT16>);
 
 using EMPrimaryTracks = EMPrimaryTracks_000;
 // iterators
@@ -733,6 +736,10 @@ DECLARE_SOA_TABLE(EMPrimaryTrackEMEventIds, "AOD", "PRMTRKEMEVENTID", emprimaryt
 // iterators
 using EMPrimaryTrackEMEventId = EMPrimaryTrackEMEventIds::iterator;
 
+DECLARE_SOA_TABLE(EMPrimaryTrackEMEventIdsTMP, "AOD", "PRMTRKEVIDTMP", track::CollisionId); // To be joined with EMPrimaryTracks in associateDileptonToEMEvent
+// iterators
+using EMPrimaryTrackEMEventIdTMP = EMPrimaryTrackEMEventIdsTMP::iterator;
+
 // Dummy data for MC
 namespace emdummydata
 {
diff --git a/PWGEM/Dilepton/TableProducer/createEMEventDilepton.cxx b/PWGEM/Dilepton/TableProducer/createEMEventDilepton.cxx
@@ -303,7 +303,7 @@ struct AssociateDileptonToEMEvent {
   Preslice<aod::V0PhotonsKF> perCollision_pcm = aod::v0photonkf::collisionId;
   PresliceUnsorted<aod::EMPrimaryElectrons> perCollision_el = aod::emprimaryelectron::collisionId;
   PresliceUnsorted<aod::EMPrimaryMuons> perCollision_mu = aod::emprimarymuon::collisionId;
-  PresliceUnsorted<aod::EMPrimaryTracks> perCollision_track = aod::emprimarytrack::collisionId;
+  Preslice<aod::EMPrimaryTrackEMEventIdsTMP> perCollision_track = aod::track::collisionId;
 
   void init(o2::framework::InitContext&) {}
 
@@ -338,7 +338,7 @@ struct AssociateDileptonToEMEvent {
     fillEventId(collisions, tracks, prmmueventid, perCollision_mu);
   }
 
-  void processChargedTrack(aod::EMEvents const& collisions, aod::EMPrimaryTracks const& tracks)
+  void processChargedTrack(aod::EMEvents const& collisions, aod::EMPrimaryTrackEMEventIdsTMP const& tracks)
   {
     fillEventId(collisions, tracks, prmtrackeventid, perCollision_track);
   }
diff --git a/PWGEM/Dilepton/TableProducer/skimmerPrimaryTrack.cxx b/PWGEM/Dilepton/TableProducer/skimmerPrimaryTrack.cxx
@@ -13,7 +13,6 @@
 /// \author daiki.sekihata@cern.ch
 
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
-// #include "PWGEM/Dilepton/Utils/PairUtilities.h"
 #include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
 
 #include "Common/Core/TableHelper.h"
@@ -59,6 +58,7 @@ struct skimmerPrimaryTrack {
   SliceCache cache;
   Preslice<aod::TracksIU> perCol = o2::aod::track::collisionId;
   Produces<aod::EMPrimaryTracks> emprimarytracks;
+  Produces<aod::EMPrimaryTrackEMEventIdsTMP> prmtrackeventidtmp;
 
   // Configurables
   Configurable<std::string> ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
@@ -72,11 +72,11 @@ struct skimmerPrimaryTrack {
   Configurable<bool> fillQAHistogram{"fillQAHistogram", false, "flag to fill QA histograms"};
   Configurable<float> d_bz_input{"d_bz_input", -999, "bz field in kG, -999 is automatic"};
 
-  Configurable<float> minpt{"minpt", 0.15, "min pt for ITS-TPC track"};
-  Configurable<float> maxpt{"maxpt", 5.0, "max pt for ITS-TPC track"};
-  Configurable<float> maxeta{"maxeta", 2.0, "eta acceptance"};
-  Configurable<float> dca_xy_max{"dca_xy_max", 1.0, "max DCAxy in cm"};
-  Configurable<float> dca_z_max{"dca_z_max", 1.0, "max DCAz in cm"};
+  Configurable<float> minpt{"minpt", 0.2, "min pt for ITS-TPC track"};
+  Configurable<float> maxpt{"maxpt", 3.0, "max pt for ITS-TPC track"};
+  Configurable<float> maxeta{"maxeta", 1.4, "eta acceptance"};
+  Configurable<float> dca_xy_max{"dca_xy_max", 0.5, "max DCAxy in cm"};
+  Configurable<float> dca_z_max{"dca_z_max", 0.5, "max DCAz in cm"};
 
   // Configurable<int> min_ncluster_tpc{"min_ncluster_tpc", 0, "min ncluster tpc"};
   // Configurable<int> mincrossedrows{"mincrossedrows", 70, "min. crossed rows"};
@@ -246,6 +246,9 @@ struct skimmerPrimaryTrack {
     if (std::fabs(trackParCov.getEta()) > maxeta || trackParCov.getPt() < minpt || maxpt < trackParCov.getPt()) {
       return false;
     }
+    if (trackParCov.getPt() > 5.f) {
+      return false;
+    }
 
     return true;
   }
@@ -311,7 +314,8 @@ struct skimmerPrimaryTrack {
         trackBit |= static_cast<uint16_t>(RefTrackBit::kFracSharedTPC07);
       }
 
-      emprimarytracks(collision.globalIndex(), track.globalIndex(), track.sign(), pt, eta, phi, dcaXY, dcaZ, trackBit);
+      emprimarytracks(track.globalIndex(), /*track.sign(),*/ static_cast<uint16_t>(pt * 1e+4), eta, phi, dcaXY, dcaZ, trackBit);
+      prmtrackeventidtmp(collision.globalIndex());
 
       stored_trackIds.emplace_back(std::pair<int, int>{collision.globalIndex(), track.globalIndex()});
 
diff --git a/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx b/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx
@@ -341,7 +341,7 @@ struct AssociatePhotonToEMEvent {
   PresliceUnsorted<aod::EMPrimaryElectronsFromDalitz> perCollisionEl = aod::emprimaryelectron::collisionId;
   Preslice<aod::PHOSClusters> perCollisionPHOS = aod::skimmedcluster::collisionId;
   Preslice<aod::SkimEMCClusters> perCollisionEMC = aod::skimmedcluster::collisionId;
-  PresliceUnsorted<aod::EMPrimaryTracks> perCollisionTrack = aod::emprimarytrack::collisionId;
+  Preslice<aod::EMPrimaryTrackEMEventIdsTMP> perCollision_track = aod::track::collisionId;
 
   void init(o2::framework::InitContext&) {}
 
@@ -370,11 +370,6 @@ struct AssociatePhotonToEMEvent {
     fillEventId(collisions, tracks, prmeleventid, perCollisionEl);
   }
 
-  void processChargedTrack(aod::EMEvents const& collisions, aod::EMPrimaryTracks const& tracks)
-  {
-    fillEventId(collisions, tracks, prmtrackeventid, perCollisionTrack);
-  }
-
   void processPHOS(aod::EMEvents const& collisions, aod::PHOSClusters const& photons)
   {
     fillEventId(collisions, photons, phoseventid, perCollisionPHOS);
@@ -385,12 +380,18 @@ struct AssociatePhotonToEMEvent {
     fillEventId(collisions, photons, emceventid, perCollisionEMC);
   }
 
+  void processChargedTrack(aod::EMEvents const& collisions, aod::EMPrimaryTrackEMEventIdsTMP const& tracks)
+  {
+    fillEventId(collisions, tracks, prmtrackeventid, perCollision_track);
+  }
+
   void processDummy(aod::EMEvents const&) {}
 
   PROCESS_SWITCH(AssociatePhotonToEMEvent, processPCM, "process pcm-event indexing", false);
   PROCESS_SWITCH(AssociatePhotonToEMEvent, processElectronFromDalitz, "process dalitzee-event indexing", false);
   PROCESS_SWITCH(AssociatePhotonToEMEvent, processPHOS, "process phos-event indexing", false);
   PROCESS_SWITCH(AssociatePhotonToEMEvent, processEMC, "process emc-event indexing", false);
+  PROCESS_SWITCH(AssociatePhotonToEMEvent, processChargedTrack, "process indexing for charged tracks", false);
   PROCESS_SWITCH(AssociatePhotonToEMEvent, processDummy, "process dummy", true);
 };
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ struct AssociateDileptonToEMEvent {`
`303`	`303`	`Preslice<aod::V0PhotonsKF> perCollision_pcm = aod::v0photonkf::collisionId;`
`304`	`304`	`PresliceUnsorted<aod::EMPrimaryElectrons> perCollision_el = aod::emprimaryelectron::collisionId;`
`305`	`305`	`PresliceUnsorted<aod::EMPrimaryMuons> perCollision_mu = aod::emprimarymuon::collisionId;`
`306`		`- PresliceUnsorted<aod::EMPrimaryTracks> perCollision_track = aod::emprimarytrack::collisionId;`
	`306`	`+ Preslice<aod::EMPrimaryTrackEMEventIdsTMP> perCollision_track = aod::track::collisionId;`
`307`	`307`
`308`	`308`	`void init(o2::framework::InitContext&) {}`
`309`	`309`
`@@ -338,7 +338,7 @@ struct AssociateDileptonToEMEvent {`
`338`	`338`	`fillEventId(collisions, tracks, prmmueventid, perCollision_mu);`
`339`	`339`	`}`
`340`	`340`
`341`		`- void processChargedTrack(aod::EMEvents const& collisions, aod::EMPrimaryTracks const& tracks)`
	`341`	`+ void processChargedTrack(aod::EMEvents const& collisions, aod::EMPrimaryTrackEMEventIdsTMP const& tracks)`
`342`	`342`	`{`
`343`	`343`	`fillEventId(collisions, tracks, prmtrackeventid, perCollision_track);`
`344`	`344`	`}`