Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Significant MC Workflow restructuring #1790

Merged

Conversation

sawenzel
Copy link
Contributor

@sawenzel sawenzel commented Nov 8, 2024

This is a bigger development related to https://its.cern.ch/jira/browse/O2-3622

It makes it possible to run embedding workflows with the --pregenCollContext feature. This means that the collision structure of all timeframes are now systematically generated before any event generation or GEANT transport stage.

The O2DPG MC workflows are restructured so that they

  • generate the collision structure (collision context) at a very high level

    • this contains information about how collisions are composed (background-signal)
    • this also fixes the vertex of the collisions
    • this fixes the number of background and signal events to be generated
    • this is now done for all timeframes at once instead of in isolation (necessary to know how many background events are needed)
  • thereafter we generate and transport background and signal events

This restructuring leads to more consistent workflow construction and smaller code. The old option --pregenCollContext is now the enforced default.

This is bigger development related to https://its.cern.ch/jira/browse/O2-3622

It makes it possible to run embedding workflows with the --pregenCollContext feature.
This means that the collision structure of all timeframes are now systematically generated
before any event generation or GEANT transport stage.

The O2DPG MC workflows are restructured so that they

* generate the collision structure (collision context) at a very high level
  - this contains information about how collisions are composed (background-signal)
  - this also fixes the vertex of the collisions
  - this fixes the number of background and signal events to be generated
  - this is now done for all timeframes at once instead of in isolation
    (necessary to know how many background events are needed)

* thereafter we generate and transport background and signal events

This restructuring leads to more consistent workflow construction
and smaller code. The old option --pregenCollContext is now the enforced
default.
Copy link

github-actions bot commented Nov 8, 2024

REQUEST FOR PRODUCTION RELEASES:
To request your PR to be included in production software, please add the corresponding labels called "async-" to your PR. Add the labels directly (if you have the permissions) or add a comment of the form (note that labels are separated by a ",")

+async-label <label1>, <label2>, !<label3> ...

This will add <label1> and <label2> and removes <label3>.

The following labels are available
async-2023-pbpb-apass4
async-2023-pp-apass4
async-2024-pp-apass1
async-2022-pp-apass7
async-2024-pp-cpass0
async-2024-PbPb-cpass0
async-2024-PbPb-apass1
async-2024-ppRef-apass1

@sawenzel sawenzel changed the title **WIP preview**: Significant MC Workflow restructuring Significant MC Workflow restructuring Dec 11, 2024
@sawenzel sawenzel merged commit dbbf327 into AliceO2Group:master Dec 12, 2024
5 checks passed
@sawenzel sawenzel deleted the swenzel/force_pregencollcontext branch December 12, 2024 09:07
@stefanopolitano stefanopolitano added async-2023-pbpb-apass4 Request porting to async-2023-pbpb-apass4 async-2024-PbPb-apass1 labels Dec 12, 2024
@alcaliva
Copy link
Collaborator

Hi @sawenzel,
when I try to port this PR for pbpb apass4 of 2023, I get conflicts (see below). What am I missing?
Alberto

DEBUG: git cherry-pick -x dbbf327
DEBUG: Auto-merging MC/bin/o2dpg_sim_workflow.py
DEBUG: CONFLICT (content): Merge conflict in MC/bin/o2dpg_sim_workflow.py
DEBUG: error: could not apply dbbf327... Significant MC Workflow restructuring (#1790)
DEBUG: hint: After resolving the conflicts, mark them with
DEBUG: hint: "git add/rm ", then run
DEBUG: hint: "git cherry-pick --continue".
DEBUG: hint: You can instead skip this commit with "git cherry-pick --skip".
DEBUG: hint: To abort and get back to the state before "git cherry-pick",
DEBUG: hint: run "git cherry-pick --abort".
DEBUG: git cherry-pick --abort
ERROR: There was a problem cherry-picking dbbf327

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
async-2023-pbpb-apass4 Request porting to async-2023-pbpb-apass4 async-2024-PbPb-apass1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants