[PWGCF] Add process function for Phi and V0s in filter2Prong #11774

stefanopolitano · 2025-06-26T07:55:00Z

This PR adds the possibility to process Phi and V0s in the filter2Prong code. PID selections can be applied at the filterCorrelation and filter2Prong levels. @skundu692 @jgrosseo @prottayCMT for your information.

… general 2 prong

github-actions · 2025-06-26T07:55:13Z

O2 linter results: ❌ 61 errors, ⚠️ 0 warnings, 🔕 0 disabled

jgrosseo

Thanks a lot. Here some comments!

PWGCF/TableProducer/filter2Prong.cxx

PWGCF/TableProducer/filterCorrelations.cxx

PWGCF/TableProducer/filter2Prong.cxx

jgrosseo

Great work! A few more comments inline, then we can merge... :)

PWGCF/TableProducer/filterCorrelations.cxx

jgrosseo · 2025-07-02T08:46:27Z

PWGCF/TableProducer/filter2Prong.cxx

+
+    if (grpPhi.DoPhi) {                       // Process Phi mesons
+      for (const auto& cftrack1 : cftracks) { // Loop over first track
+        const auto& p1 = tracks.iteratorAt(cftrack1.trackId() - tracks.begin().globalIndex());


Why don't we use?

Suggested change

const auto& p1 = tracks.iteratorAt(cftrack1.trackId() - tracks.begin().globalIndex());

const auto& p1 = cftrack1.track();

I am not sure this can be done straightforwardly. As far as I understood, cftrack1 only contains the global track and collision indexes, while the physics information are stored in the CFTracks (which however do not contain global index information, but only cf-index ones) and PIDTrack tables. We might need to modify the tables in order to have both the physics and global index information to do it more efficiently than how it is currently done. What do you think?

I disagree with your statement (Track in CFTrack is an index to the global track to my understanding) but I don't want to delay this PR. We can try it together one of these days.

PWGCF/TableProducer/filter2Prong.cxx

jgrosseo · 2025-07-02T08:52:51Z

PWGCF/TableProducer/filterCorrelations.cxx

+  /*
+  template <typename T>
+  using HasProtonPID = decltype(selectionPIDProton(std::declval<T&>()));
+  */


Shall we remove the commented lines?

jgrosseo · 2025-07-02T08:54:40Z

PWGCF/TableProducer/filterCorrelations.cxx

  }

-  void processData(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CFMultiplicities>>::iterator const& collision, aod::BCsWithTimestamps const&, soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection>> const& tracks)
+  void processData(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CFMultiplicities>>::iterator const& collision, aod::BCsWithTimestamps const&, soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::pidTPCPr, aod::pidTOFPr, aod::TracksDCA>> const& tracks)


If I understand correctly now one cannot use this task anymore without PID information? I think that is not good.
We have to make 2 process functions which then can call a templated one, to avoid the code duplication...

I split the process function, one for data (default) and one for data pid. They both access a common templated function. Thanks!

I assume you tested both?

PWGCF/TableProducer/filterCorrelations.cxx

jgrosseo

Great! I will now seek feedback from @jaelpark as well.
You can already fix the clang in the meanwhile?
We can then remove the draft status.

jgrosseo · 2025-07-07T07:23:25Z

PWGCF/TableProducer/filter2Prong.cxx

+
+    if (grpPhi.DoPhi) {                       // Process Phi mesons
+      for (const auto& cftrack1 : cftracks) { // Loop over first track
+        const auto& p1 = tracks.iteratorAt(cftrack1.trackId() - tracks.begin().globalIndex());


I disagree with your statement (Track in CFTrack is an index to the global track to my understanding) but I don't want to delay this PR. We can try it together one of these days.

jgrosseo · 2025-07-07T07:28:10Z

PWGCF/TableProducer/filterCorrelations.cxx

  }

-  void processData(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CFMultiplicities>>::iterator const& collision, aod::BCsWithTimestamps const&, soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection>> const& tracks)
+  void processData(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CFMultiplicities>>::iterator const& collision, aod::BCsWithTimestamps const&, soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::pidTPCPr, aod::pidTOFPr, aod::TracksDCA>> const& tracks)


I assume you tested both?

PWGCF/TableProducer/filterCorrelations.cxx

jaelpark · 2025-07-07T08:07:12Z

PWGCF/TableProducer/filterCorrelations.cxx

  O2_DEFINE_CONFIGURABLE(cfgCutEta, float, 0.8f, "Eta range for tracks")

  Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPt);
-  Filter trackSelection = (requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true);


There's a problem with the clang-format and the subsequent checks, they are not compatible. To pass the test, this needs to be manually changed back to (uint8_t) true (with the space) each time before commit (same for the other one higher up).

PWGCF/TableProducer/filterCorrelations.cxx

PWGCF/TableProducer/filter2Prong.cxx

stefanopolitano · 2025-07-07T14:48:08Z

Hi @jaelpark ! Thanks a lot for your suggestions, I implemented them in the last commit. Let me know if you have further comments

Please consider the following formatting changes to AliceO2Group#11774

jaelpark · 2025-07-07T15:56:15Z

Thanks! No other comments from me.

…Group#11774)

stefanopolitano added 8 commits June 25, 2025 22:44

[PWGCF] Adding V0s and Phi cases in filter2Prong processing

00bcf18

Adding possibility to store Pr PID in CFtracks

c77d98b

Update cf tables with pid information

8d9b971

Add momentum dependent pid sel in cf tracks

06f8546

Minor fix

eeca237

Adding pid info in cf tracktype and splitting V0s and Phi filter from…

ba947fd

… general 2 prong

cleaning code and removing commented lines

5aed3db

cleaning code

e9c2b0d

github-actions bot added pwgcf datamodel labels Jun 26, 2025

alibuild mentioned this pull request Jun 26, 2025

Please consider the following formatting changes to #11774 stefanopolitano/O2Physics#19

Merged

jgrosseo reviewed Jun 27, 2025

View reviewed changes

skundu692 reviewed Jun 27, 2025

View reviewed changes

PWGCF/TableProducer/filter2Prong.cxx Outdated Show resolved Hide resolved

Implementing Sourav and Jan comments

6080e47

jgrosseo reviewed Jul 2, 2025

View reviewed changes

Implementing Jan comments

5c53654

jgrosseo reviewed Jul 7, 2025

View reviewed changes

jaelpark reviewed Jul 7, 2025

View reviewed changes

PWGCF/TableProducer/filterCorrelations.cxx Outdated Show resolved Hide resolved

jaelpark reviewed Jul 7, 2025

View reviewed changes

PWGCF/TableProducer/filterCorrelations.cxx Outdated Show resolved Hide resolved

jaelpark reviewed Jul 7, 2025

View reviewed changes

PWGCF/TableProducer/filterCorrelations.cxx Outdated Show resolved Hide resolved

jaelpark reviewed Jul 7, 2025

View reviewed changes

PWGCF/TableProducer/filter2Prong.cxx Outdated Show resolved Hide resolved

jaelpark reviewed Jul 7, 2025

View reviewed changes

PWGCF/TableProducer/filter2Prong.cxx Outdated Show resolved Hide resolved

jaelpark reviewed Jul 7, 2025

View reviewed changes

PWGCF/TableProducer/filter2Prong.cxx Outdated Show resolved Hide resolved

jaelpark reviewed Jul 7, 2025

View reviewed changes

PWGCF/TableProducer/filter2Prong.cxx Outdated Show resolved Hide resolved

stefanopolitano and others added 2 commits July 7, 2025 15:56

Implementing Jasper comments

7c2a7a8

Please consider the following formatting changes

52e2962

jgrosseo marked this pull request as ready for review July 7, 2025 14:57

jgrosseo requested review from alibuild, ariedel-cern, glromane, lauraser, lgraczykCern, otonvd, prchakra, saganatt, shouqiye, victor-gonzalez and zchochul as code owners July 7, 2025 14:57

Merge pull request #19 from alibuild/alibot-cleanup-11774

4f7498a

Please consider the following formatting changes to AliceO2Group#11774

fixing unused variable issue

0937d75

jgrosseo enabled auto-merge (squash) July 8, 2025 08:22

jgrosseo approved these changes Jul 8, 2025

View reviewed changes

jgrosseo merged commit bb027af into AliceO2Group:master Jul 8, 2025
11 of 12 checks passed

jpxrk pushed a commit to jpxrk/O2Physics that referenced this pull request Jul 16, 2025

[PWGCF] Add process function for Phi and V0s in filter2Prong (AliceO2…

f136111

…Group#11774)

prottayCMT pushed a commit to prottayCMT/O2Physics2024 that referenced this pull request Jul 18, 2025

[PWGCF] Add process function for Phi and V0s in filter2Prong (AliceO2…

157db96

…Group#11774)

JimunLee pushed a commit to JimunLee/O2Physics that referenced this pull request Jul 22, 2025

[PWGCF] Add process function for Phi and V0s in filter2Prong (AliceO2…

fda8e56

…Group#11774)

vojmach pushed a commit to vojmach/O2Physics that referenced this pull request Jul 23, 2025

[PWGCF] Add process function for Phi and V0s in filter2Prong (AliceO2…

f730f76

…Group#11774)

jloemker pushed a commit to jloemker/O2Physics that referenced this pull request Nov 11, 2025

[PWGCF] Add process function for Phi and V0s in filter2Prong (AliceO2…

07ddd1f

…Group#11774)

alibuild pushed a commit to alibuild/O2Physics that referenced this pull request Dec 5, 2025

[PWGCF] Add process function for Phi and V0s in filter2Prong (AliceO2…

61cedd5

…Group#11774)

	const auto& p1 = tracks.iteratorAt(cftrack1.trackId() - tracks.begin().globalIndex());
	const auto& p1 = cftrack1.track();

[PWGCF] Add process function for Phi and V0s in filter2Prong #11774

[PWGCF] Add process function for Phi and V0s in filter2Prong #11774

Uh oh!

Conversation

stefanopolitano commented Jun 26, 2025

Uh oh!

github-actions bot commented Jun 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jgrosseo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jgrosseo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jgrosseo left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jaelpark Jul 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stefanopolitano commented Jul 7, 2025

Uh oh!

jaelpark commented Jul 7, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

5 participants

github-actions bot commented Jun 26, 2025 •

edited

Loading

jaelpark Jul 7, 2025 •

edited

Loading