Skip to content

PWGCF: bug fixes in femtodream#2735

Merged
victor-gonzalez merged 10 commits into
AliceO2Group:masterfrom
ariedel-cern:FemtoDev
Jun 2, 2023
Merged

PWGCF: bug fixes in femtodream#2735
victor-gonzalez merged 10 commits into
AliceO2Group:masterfrom
ariedel-cern:FemtoDev

Conversation

@ariedel-cern
Copy link
Copy Markdown
Collaborator

This PR contains several bug fixes of the FemtoDream framework:

  • add missing |eta| cut on V0s
  • replace LOG calls in CutCulator with std::cout. CutCulator is a standalone binary for generating bitmasks used by the tasks in femtodream. Using std::cout makes the output much easier to parse.
  • Recent update to the MC code has broken the debug tasks. This will be fixed.
  • The o2-aod-merger makes implicit assumptions on the table names since it is a standalone binary not part of the framework. As such all tables within femtodream had to be renamed to conform with o2-aod-merger.

For the o2-aod-merger to work on merging derived data generated by the
femtodream-producer task the naming of table have to follow the naming
conventions of the O2 framework.
Comment thread PWGCF/DataModel/FemtoDerived.h Outdated
static constexpr std::string_view MCTypeName[kNMCTypes] = {"", "_MC"};

DECLARE_SOA_INDEX_COLUMN(FemtoDreamCollision, femtoDreamCollision);
// DECLARE_SOA_INDEX_COLUMN(FemtoDreamCollision, femtoDreamCollision);
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please, not commented code. Much less in the datamodel

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I took the freedom to remove the commented line

Comment thread PWGCF/DataModel/FemtoDerived.h Outdated
using FemtoDreamMCLabel = FemtoDreamMCLabels::iterator;
DECLARE_SOA_TABLE(FDMCLabels, "AOD", "FDMCLabel", //! Table joinable to FemtoDreamParticle containing the MC labels
mcfdlabel::FDMCParticleId);
// using FDMCLabel = FDMCLabels::iterator;
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please, not commented code

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I took the freedom to remove the commented line

Removed data model commented code
@victor-gonzalez victor-gonzalez merged commit d035fb3 into AliceO2Group:master Jun 2, 2023
hahassan7 pushed a commit to hahassan7/O2Physics that referenced this pull request Jul 11, 2023
* Feat: add |eta| cut to V0s

* Feat: add automatice systematic variations to cutculator

* Fix: fix debug tasks

* Fix: fix naming of femtodream tables

For the o2-aod-merger to work on merging derived data generated by the
femtodream-producer task the naming of table have to follow the naming
conventions of the O2 framework.

* Fix: fix order of includes

* Fix: fix copyright headers

* Revert "Fix: fix copyright headers"

This reverts commit 09a0db6.

* Fix: fix copyright headers

* Fix: use consistent headers

* Update FemtoDerived.h

Removed data model commented code

---------

Co-authored-by: Anton Riedel <anton.riedel@tum.de>
Co-authored-by: Victor Gonzalez <victor.gonzalez.sebastian@gmail.com>
hahassan7 pushed a commit to hahassan7/O2Physics that referenced this pull request Oct 7, 2023
* Feat: add |eta| cut to V0s

* Feat: add automatice systematic variations to cutculator

* Fix: fix debug tasks

* Fix: fix naming of femtodream tables

For the o2-aod-merger to work on merging derived data generated by the
femtodream-producer task the naming of table have to follow the naming
conventions of the O2 framework.

* Fix: fix order of includes

* Fix: fix copyright headers

* Revert "Fix: fix copyright headers"

This reverts commit 09a0db6.

* Fix: fix copyright headers

* Fix: use consistent headers

* Update FemtoDerived.h

Removed data model commented code

---------

Co-authored-by: Anton Riedel <anton.riedel@tum.de>
Co-authored-by: Victor Gonzalez <victor.gonzalez.sebastian@gmail.com>
chengtt0406 pushed a commit to chengtt0406/O2Physics that referenced this pull request Dec 6, 2023
* Feat: add |eta| cut to V0s

* Feat: add automatice systematic variations to cutculator

* Fix: fix debug tasks

* Fix: fix naming of femtodream tables

For the o2-aod-merger to work on merging derived data generated by the
femtodream-producer task the naming of table have to follow the naming
conventions of the O2 framework.

* Fix: fix order of includes

* Fix: fix copyright headers

* Revert "Fix: fix copyright headers"

This reverts commit 09a0db6.

* Fix: fix copyright headers

* Fix: use consistent headers

* Update FemtoDerived.h

Removed data model commented code

---------

Co-authored-by: Anton Riedel <anton.riedel@tum.de>
Co-authored-by: Victor Gonzalez <victor.gonzalez.sebastian@gmail.com>
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