Skip to content

Conversation

@pbuehler
Copy link
Contributor

This is useful when simulating different SPLITIDs/CYCLEs of a run in separate jobs.

For given parameters:
PRODSPLIT
NTIMEFRAMES
NSIGEVENTS
SPLITID
CYCLE

the offset can e.g. be calculated with:
HEPMCOFFSETecho "(${CYCLE}+${PRODSPLIT}*(${SPLITID}-1))*${NTIMEFRAMES}*${NSIGEVENTS}" | bc

…mulating different SPLITIDs of a run in separate jobs.
@github-actions
Copy link

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-apass3
async-2023-pbpb-apass4
async-2023-pp-apass4
async-2024-pp-apass1
async-2022-pp-apass7
async-2024-pp-cpass0

@pbuehler
Copy link
Contributor Author

+async-label async-2023-pbpb-apass3, async-2023-pbpb-apass4, async-2023-pp-apass4, async-2024-pp-apass1, async-2022-pp-apass7, async-2024-pp-cpass0

@github-actions github-actions bot added async-2022-pp-apass7 Request porting to async-2022-pp-apass7 async-2023-pbpb-apass3 async-2023-pbpb-apass4 Request porting to async-2023-pbpb-apass4 async-2023-pp-apass4 Request porting to async-2023-pp-apass4 async-2024-pp-apass1 Request porting to async-2024-pp-apass1 async-2024-pp-cpass0 Request porting to async-2024-pp-cpass0 labels Sep 18, 2024
@pbuehler
Copy link
Contributor Author

Hi @sawenzel could you please have a look at this?

@sawenzel sawenzel merged commit 9780b46 into AliceO2Group:master Sep 20, 2024
@alcaliva
Copy link
Collaborator

Dear @pbuehler,
your PR gives conflicts. Could you please check which other PRs are needed?

@pbuehler
Copy link
Contributor Author

Hi @alcaliva, which conflicts do you mean?

@alcaliva
Copy link
Collaborator

I get conflicts when cherry-picking the PR, which implies that there is something else missing.

@pbuehler
Copy link
Contributor Author

pbuehler commented Sep 27, 2024

Doesn't it tell you where the conflict is?
To be honest I do not know how to do the check you suggest. However if you give me some guidance I am willing to help.

@alcaliva
Copy link
Collaborator

alcaliva commented Oct 2, 2024

Hi @pbuehler,

when trying to cherry-pick your PR, I get the following error message:

INFO: Sort commits from oldest to most recent
['9780b4622fdb82bc8e55d54249e77760dbaa989d']
ERROR: There was a problem cherry-picking 9780b46
Auto-merging MC/bin/o2dpg_sim_workflow.py
CONFLICT (content): Merge conflict in MC/bin/o2dpg_sim_workflow.py
CONFLICT (modify/delete): UTILS/ReadHepMCEventSkip.sh deleted in HEAD and modified in 9780b46 (Added possibility to define a general HEPMCOFFSET. Is usefull when simulating different SPLITIDs of a run in separate jobs. (#1730)). Version 9780b46 (Added possibility to define a general HEPMCOFFSET. Is usefull when simulating different SPLITIDs of a run in separate jobs. (#1730)) of UTILS/ReadHepMCEventSkip.sh left in tree.
error: could not apply 9780b46... Added possibility to define a general HEPMCOFFSET. Is usefull when simulating different SPLITIDs of a run in separate jobs. (#1730)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
INFO: Trying to continue

This usually implies that something else is missing.

@alcaliva
Copy link
Collaborator

alcaliva commented Oct 8, 2024

Hi @pbuehler,
is there any progress? We have created a new software tag and also this time we had to leave this PR out. Please, get in touch with @sawenzel in case you need help

@chiarazampolli chiarazampolli removed the async-2024-pp-cpass0 Request porting to async-2024-pp-cpass0 label Dec 5, 2024
@chiarazampolli
Copy link
Collaborator

Removing for cpass0 of pp 2024, it makes no sense there.

@alcaliva
Copy link
Collaborator

Hi @pbuehler,
this PR is there since a long time but it seems to be comòlicated to back port it. Do you have a solution for that? DO you still need it? Please let us know asap

@alcaliva alcaliva removed async-2023-pbpb-apass4 Request porting to async-2023-pbpb-apass4 async-2023-pp-apass4 Request porting to async-2023-pp-apass4 labels Dec 20, 2024
@alcaliva alcaliva removed async-2024-pp-apass1 Request porting to async-2024-pp-apass1 async-2022-pp-apass7 Request porting to async-2022-pp-apass7 labels Dec 20, 2024
@alcaliva alcaliva added the async-2024-pp-apass1 Request porting to async-2024-pp-apass1 label Jan 31, 2025
alcaliva pushed a commit that referenced this pull request Jan 31, 2025
…mulating different SPLITIDs of a run in separate jobs. (#1730)

Co-authored-by: Paul Buehler <paul.buhler@cern.ch>
(cherry picked from commit 9780b46)
alcaliva pushed a commit that referenced this pull request Jan 31, 2025
…mulating different SPLITIDs of a run in separate jobs. (#1730)

Co-authored-by: Paul Buehler <paul.buhler@cern.ch>
(cherry picked from commit 9780b46)
alcaliva pushed a commit that referenced this pull request Jan 31, 2025
…mulating different SPLITIDs of a run in separate jobs. (#1730)

Co-authored-by: Paul Buehler <paul.buhler@cern.ch>
(cherry picked from commit 9780b46)
alcaliva pushed a commit that referenced this pull request Jan 31, 2025
…mulating different SPLITIDs of a run in separate jobs. (#1730)

Co-authored-by: Paul Buehler <paul.buhler@cern.ch>
(cherry picked from commit 9780b46)
alcaliva pushed a commit that referenced this pull request Feb 2, 2025
…mulating different SPLITIDs of a run in separate jobs. (#1730)

Co-authored-by: Paul Buehler <paul.buhler@cern.ch>
(cherry picked from commit 9780b46)
alcaliva pushed a commit that referenced this pull request Feb 2, 2025
…mulating different SPLITIDs of a run in separate jobs. (#1730)

Co-authored-by: Paul Buehler <paul.buhler@cern.ch>
(cherry picked from commit 9780b46)
alcaliva pushed a commit that referenced this pull request Feb 2, 2025
…mulating different SPLITIDs of a run in separate jobs. (#1730)

Co-authored-by: Paul Buehler <paul.buhler@cern.ch>
(cherry picked from commit 9780b46)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

async-2024-pp-apass1 Request porting to async-2024-pp-apass1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants