Skip to content

PWGHF: Implement other channels for omegac0 in candidateCreator#5893

Merged
fgrosa merged 29 commits intoAliceO2Group:masterfrom
ZFederica:working
May 10, 2024
Merged

PWGHF: Implement other channels for omegac0 in candidateCreator#5893
fgrosa merged 29 commits intoAliceO2Group:masterfrom
ZFederica:working

Conversation

@ZFederica
Copy link
Contributor

Hello @fgrosa, is this implementation similar to the one you had in mind?

@ZFederica ZFederica marked this pull request as ready for review May 6, 2024 13:29
Copy link
Collaborator

@fgrosa fgrosa left a comment

Choose a reason for hiding this comment

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

Hi @ZFederica thanks a lot for the development! I have a few comments before merging, see below

ZFederica and others added 4 commits May 10, 2024 09:42
Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>
Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>
Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>
Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>
@ZFederica ZFederica requested a review from jpxrk as a code owner May 10, 2024 07:55
@vkucera
Copy link
Collaborator

vkucera commented May 10, 2024

Converting to draft as there seems to be work in progress. Please keep in mind that every time you update the PR, you ask the CI to run a new build.

@vkucera vkucera marked this pull request as draft May 10, 2024 08:31
@ZFederica
Copy link
Contributor Author

ZFederica commented May 10, 2024

Hi @vkucera, this PR is ready for review - I have implemented all the requested changes. I was just wondering how I could resolve the merge conflicts: the new version of the code already takes into account and implements the bug fix that created the conflict, but that function changed a lot

@vkucera vkucera marked this pull request as ready for review May 10, 2024 10:05
@vkucera
Copy link
Collaborator

vkucera commented May 10, 2024

Hi @vkucera, this PR is ready for review - I have implemented all the requested changes. I was just wondering how I could resolve the merge conflicts: the new version of the code already takes into account and implements the bug fix that created the conflict, but that function changed a lot

Hi @ZFederica , you have to merge the upstream/master branch into your branch.

@alibuild
Copy link
Collaborator

Error while checking build/O2Physics/o2 for a885973 at 2024-05-10 14:52:

## sw/BUILD/O2Physics-latest/log
/sw/SOURCES/O2Physics/5893-slc7_x86-64/0/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx:1050:74: error: no matching function for call to 'HfCandidateCreatorXic0Omegac0Mc::runXic0Omegac0Mc<o2::aod::hf_cand_xic0_omegac0::XiczeroToXiPi>(const o2::aod::HfCandToXiPi&, const o2::aod::TracksWMc&, const o2::aod::McParticles&, const o2::aod::McCollisionLabels&)'
/sw/SOURCES/O2Physics/5893-slc7_x86-64/0/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx:1059:77: error: no matching function for call to 'HfCandidateCreatorXic0Omegac0Mc::runXic0Omegac0Mc<o2::aod::hf_cand_xic0_omegac0::OmegaczeroToXiPi>(const o2::aod::HfCandToXiPi&, const o2::aod::TracksWMc&, const o2::aod::McParticles&, const o2::aod::McCollisionLabels&)'
/sw/SOURCES/O2Physics/5893-slc7_x86-64/0/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx:1068:80: error: no matching function for call to 'HfCandidateCreatorXic0Omegac0Mc::runXic0Omegac0Mc<o2::aod::hf_cand_xic0_omegac0::OmegaczeroToOmegaPi>(const o2::aod::HfCandToOmegaPi&, const o2::aod::TracksWMc&, const o2::aod::McParticles&, const o2::aod::McCollisionLabels&)'
/sw/SOURCES/O2Physics/5893-slc7_x86-64/0/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx:1077:79: error: no matching function for call to 'HfCandidateCreatorXic0Omegac0Mc::runXic0Omegac0Mc<o2::aod::hf_cand_xic0_omegac0::OmegaczeroToOmegaK>(const o2::aod::HfCandToOmegaK&, const o2::aod::TracksWMc&, const o2::aod::McParticles&, const o2::aod::McCollisionLabels&)'
ninja: build stopped: subcommand failed.

Full log here.

@fgrosa
Copy link
Collaborator

fgrosa commented May 10, 2024

Hi @ZFederica once resolved the conflicts it's good for me. Thanks!

@fgrosa fgrosa enabled auto-merge (squash) May 10, 2024 15:12
@fgrosa fgrosa merged commit 8aaa5ea into AliceO2Group:master May 10, 2024
ddobrigk pushed a commit to ddobrigk/O2Physics that referenced this pull request May 11, 2024
…eO2Group#5893)

* Implement other channels

* Add note

* Continue implementation

* Update

* Fix build errors

* Please consider the following formatting changes

* Fix check on enabled processes

* Please consider the following formatting changes

* Fix megalinter error

* Update PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx

Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>

* Update PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx

Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>

* Update PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx

Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>

* Update PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx

Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>

* Remove dupl var massPDG

* Switch double -> float

* Remove hfflags

* Double->float also in treecreator

* Update

* Update namespace as requested in other PR

* Update

* Fix build error

* Fix conflicts

* Please consider the following formatting changes

---------

Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>
@ZFederica ZFederica deleted the working branch May 13, 2024 09:00
hahassan7 pushed a commit to hahassan7/O2Physics that referenced this pull request May 17, 2024
…eO2Group#5893)

* Implement other channels

* Add note

* Continue implementation

* Update

* Fix build errors

* Please consider the following formatting changes

* Fix check on enabled processes

* Please consider the following formatting changes

* Fix megalinter error

* Update PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx

Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>

* Update PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx

Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>

* Update PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx

Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>

* Update PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx

Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>

* Remove dupl var massPDG

* Switch double -> float

* Remove hfflags

* Double->float also in treecreator

* Update

* Update namespace as requested in other PR

* Update

* Fix build error

* Fix conflicts

* Please consider the following formatting changes

---------

Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants