Skip to content

Conversation

@justonedev1
Copy link
Collaborator

This ticket was created to address ticket QC-1243. The script is meant to be run on STG and PROD after installation of flp-suite with the changes.

However please don't merge this, I am not 100% sure that everything is working and I wanted to trigger our CI/CD tests.

@justonedev1 justonedev1 changed the title [Framework] changes necessary to switch beamType to pdpBeamType [QC-1243]: Fix consistency in beam type names Apr 22, 2025
Copy link
Collaborator

@knopers8 knopers8 left a comment

Choose a reason for hiding this comment

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

Thanks, it looks good. I would only propose a minor improvement to the documentation.

doc/Advanced.md Outdated
It allows to have variations of the parameters depending on the run and beam types. The proper run types can be found here: [ECSDataAdapters.h](https://github.com/AliceO2Group/AliceO2/blob/dev/DataFormats/Parameters/include/DataFormatsParameters/ECSDataAdapters.h#L54). The `default` can be used
to ignore the run or the beam type.
The beam type is one of the following: `PROTON-PROTON`, `Pb-Pb`, `Pb-PROTON`, `cosmic`.
The beam type is one of the following: `pp`, `PbPb`, `pPb`, `cosmic`.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
The beam type is one of the following: `pp`, `PbPb`, `pPb`, `cosmic`.
The beam type comes from the parameter `pdp_beam_type` set by ECS and can be one of the following: `pp`, `PbPb`, `pPb`, `pO`, `OO`, `NeNe`, `cosmic`, `technical`.
See `[readout-dataflow](https://github.com/AliceO2Group/ControlWorkflows/blob/master/workflows/readout-dataflow.yaml)` to verify the possible values.

Given that we changed the source of this, we can be more helpful in explaining where the expected values come from.

@knopers8
Copy link
Collaborator

Actually, could you also grep the code of user modules for the affected string uses? I just saw one in the Felix' PR, so I imagine there might be more...

@knopers8 knopers8 mentioned this pull request Apr 23, 2025
@justonedev1
Copy link
Collaborator Author

justonedev1 commented Apr 23, 2025

I did grep over whole repo (hence the other reviewers for this PR than you and Barth). Reason why you see it in his code might be because he is using current master as a base branch where the changes are not present. I can wait until he merges, rebase this on new master and check again.

@knopers8
Copy link
Collaborator

I meant other uses, which could be already in master. I understand that his PR is not master. In any case, I'm happy that there are no other uses, then we are good to go, I believe.

@knopers8 knopers8 enabled auto-merge (squash) April 23, 2025 09:54
@knopers8 knopers8 disabled auto-merge April 24, 2025 08:32
@knopers8 knopers8 merged commit 35aeb25 into master Apr 24, 2025
6 checks passed
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.

3 participants