Skip to content

Conversation

@lubynets
Copy link
Contributor

Such common parts as:

  • filling event properties;
  • tables size reservation;
  • filling Lite, Full and KF tables;
  • candidate's invariant mass evaluation

used both an MC and Data oriented functions were encapsulated in separate functions.

The treeCreatorLcToPKPi's output was checked before and after the PR changes in the following conditions: MC and Data; DCAFitter and KFParticle; Lite and Full table. In all 2×2×2=8 cases there was the byte-to-byte size match of produced AnalysisResults_trees.root files before and after PR.

@github-actions
Copy link

github-actions bot commented Apr 29, 2025

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

@github-actions github-actions bot changed the title Reduce code duplication in the treeCreatorLcToPKPi [PWGHF] Reduce code duplication in the treeCreatorLcToPKPi Apr 29, 2025
@mfaggin
Copy link
Collaborator

mfaggin commented Apr 30, 2025

Hi @lubynets , from a quick look your proposals look good to me. If it is fine with you, I'd just ask you to wait for this PR here #10984 which introduces a massive development in the framework. If it is fine with you, I'd ask you to wait for it and rebase on it, before merging yours.

@lubynets
Copy link
Contributor Author

Hi @lubynets , from a quick look your proposals look good to me. If it is fine with you, I'd just ask you to wait for this PR here #10984 which introduces a massive development in the framework. If it is fine with you, I'd ask you to wait for it and rebase on it, before merging yours.

Hi @mfaggin, yes, it's fine with me to wait until another PR is merged.

@lubynets
Copy link
Contributor Author

lubynets commented May 2, 2025

Hi @mfaggin,
As I see the PR 10984 was merged.
Should I really rebase my branch with master (that will require force push), or merge master into my branch will be also ok? In both cases there will be conflicts, however I already addressed them in merge mode. The only thing which I am concerned of is that after git merge, my PR will pretend to have plenty of changes which were done neither by me nor by you in your PR, that may trigger all possible PWGs and assign all possible labels (?)...
Here is the clone of my branch after git merge master and resolving a conflict https://github.com/lubynets/O2Physics/commits/tlc_merge/ Is it ok if I do the same with the source branch of my PR?

@vkucera
Copy link
Collaborator

vkucera commented May 4, 2025

As long as you don't modify the commits merged from upstream, they will not appear in your PR.

@lubynets
Copy link
Contributor Author

lubynets commented May 5, 2025

Dear @mfaggin (@vkucera cc),
I updated my PR according to the master branch. Could you please have a look at it?

Copy link
Collaborator

@mfaggin mfaggin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @lubynets , approved

@mfaggin mfaggin merged commit 8e7592b into AliceO2Group:master May 6, 2025
12 of 13 checks passed
@lubynets lubynets deleted the treeLc branch May 6, 2025 08:35
jinhyunni pushed a commit to jinhyunni/O2Physics that referenced this pull request May 11, 2025
jinhyunni pushed a commit to jinhyunni/O2Physics that referenced this pull request May 11, 2025
prottayCMT pushed a commit to prottayCMT/O2Physics2024 that referenced this pull request May 17, 2025
ariedel-cern pushed a commit to ariedel-cern/O2Physics that referenced this pull request May 23, 2025
ddobrigk pushed a commit to ddobrigk/O2Physics that referenced this pull request Jun 14, 2025
smaff92 pushed a commit to smaff92/O2Physics that referenced this pull request Jun 17, 2025
alibuild pushed a commit to alibuild/O2Physics that referenced this pull request Aug 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pwghf PWG-HF

Development

Successfully merging this pull request may close these issues.

3 participants