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

fix in track propagation to TOF for MC #13784

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Conversation

noferini
Copy link
Collaborator

@noferini noferini commented Dec 9, 2024

This is to fix an issue for missing piece in track length for TOF.
For the moment it is applied only to MC since for DATA old calibrations have to be adjusted before to apply the fix

watchers: @chiarazampolli @njacazio @ercolessi

@noferini noferini requested a review from shahor02 as a code owner December 9, 2024 14:40
Copy link
Contributor

github-actions bot commented Dec 9, 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-apass1
async-2024-ppRef-apass1

@noferini noferini added 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-2022-pp-apass7 Request porting to async-2022-pp-apass7 async-2024-PbPb-apass1 async-2024-ppRef-apass1 labels Dec 9, 2024
@noferini noferini force-pushed the dev branch 3 times, most recently from 791d598 to 246b444 Compare December 11, 2024 13:43
@noferini noferini changed the title [WIP] fix in track propagation to TOF for MC fix in track propagation to TOF for MC Dec 13, 2024
@noferini
Copy link
Collaborator Author

Hi @shahor02 ,
I started the review of this PR but I didn't mark it for Pb-Pb apass1. As discussed for the moment this is needed only for MC (mainly for other data passes and in view of QM approvals).
I tested it and both results and cpu performances are fine (CPU time unchanged).
... waiting for your review
Cheers,
Francesco

@shahor02
Copy link
Collaborator

@noferini thanks, looks good, shall I merge it already?

@noferini
Copy link
Collaborator Author

Hi @shahor02
thanks!
I think it can be merged, since RelVal is already running and I assume this will not enter in Pb-Pb apass1 reco.
Let's wait also for a confirmation by @chiarazampolli or @alcaliva

@chiarazampolli chiarazampolli merged commit 7e24578 into AliceO2Group:dev Dec 16, 2024
13 checks passed
@chiarazampolli
Copy link
Collaborator

Thanks, merged.
We might cherry-pick this one or tag from the daily of 17.12 (where it will be included).

@chiarazampolli
Copy link
Collaborator

Hello,

There was a misunderstanding from this PR: I thought that the worry was that it did not go to the tag for apass1 of PbPb 2024, which is actually what @noferini wanted. So in the end it did enter... We need to revert it there.

chiarazampolli added a commit to chiarazampolli/AliceO2 that referenced this pull request Dec 19, 2024
This reverts commit 7e24578.
Needed for apass1 of PbPb 2024 which was calibrated with the issue, so if we apply this fix,
the TOF times will not be centered at zero.
shahor02 pushed a commit that referenced this pull request Dec 19, 2024
This reverts commit 7e24578.
Needed for apass1 of PbPb 2024 which was calibrated with the issue, so if we apply this fix,
the TOF times will not be centered at zero.
chiarazampolli added a commit that referenced this pull request Dec 19, 2024
This reverts commit 7e24578.
Needed for apass1 of PbPb 2024 which was calibrated with the issue, so if we apply this fix,
the TOF times will not be centered at zero.

(cherry picked from commit 001ae07)
chiarazampolli added a commit to chiarazampolli/AliceO2 that referenced this pull request Dec 19, 2024
…13784)""

This reverts commit 001ae07.
We have to bring this back for productions that are not apass1 of PbPb 2024.
shahor02 pushed a commit that referenced this pull request Dec 19, 2024
This reverts commit 001ae07.
We have to bring this back for productions that are not apass1 of PbPb 2024.
alcaliva pushed a commit that referenced this pull request Dec 20, 2024
Co-authored-by: noferini <[email protected]>
(cherry picked from commit 7e24578)
@alcaliva alcaliva removed the async-2023-pbpb-apass4 Request porting to async-2023-pbpb-apass4 label Dec 20, 2024
alcaliva pushed a commit that referenced this pull request Dec 20, 2024
Co-authored-by: noferini <[email protected]>
(cherry picked from commit 7e24578)
@alcaliva alcaliva added async-2024-pp-apass1 Request porting to async-2024-pp-apass1 and removed async-2024-pp-apass1 Request porting to async-2024-pp-apass1 labels Dec 20, 2024
alcaliva pushed a commit that referenced this pull request Dec 20, 2024
Co-authored-by: noferini <[email protected]>
(cherry picked from commit 7e24578)
alcaliva pushed a commit that referenced this pull request Dec 20, 2024
Co-authored-by: noferini <[email protected]>
(cherry picked from commit 7e24578)
@alcaliva alcaliva added async-2023-pbpb-apass4 Request porting to async-2023-pbpb-apass4 and removed async-2024-pp-apass1 Request porting to async-2024-pp-apass1 async-2023-pbpb-apass4 Request porting to async-2023-pbpb-apass4 labels Dec 21, 2024
@alcaliva
Copy link
Collaborator

Hi @noferini , is this feature needed also for apass7?
When porting this PR to async-v1-01-02g I get conflicts (see below)

ERROR: There was a problem cherry-picking 7e24578
Auto-merging DataFormats/Reconstruction/include/ReconstructionDataFormats/MatchInfoTOF.h
Auto-merging DataFormats/Reconstruction/include/ReconstructionDataFormats/MatchInfoTOFReco.h
Auto-merging Detectors/GlobalTracking/include/GlobalTracking/MatchTOF.h
Auto-merging Detectors/GlobalTracking/src/MatchTOF.cxx
CONFLICT (content): Merge conflict in Detectors/GlobalTracking/src/MatchTOF.cxx
error: could not apply 7e24578... fix in track propagation to TOF for MC (#13784)
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".

@alcaliva alcaliva removed the async-2022-pp-apass7 Request porting to async-2022-pp-apass7 label Dec 22, 2024
@noferini
Copy link
Collaborator Author

Hi @alcaliva ,
I resumed only today an I saw your message.
It seems to me that the conflict was due to this missing PR
#13582

@alcaliva alcaliva added the async-2024-pp-apass1 Request porting to async-2024-pp-apass1 label Jan 16, 2025
alcaliva pushed a commit that referenced this pull request Jan 16, 2025
Co-authored-by: noferini <[email protected]>
(cherry picked from commit 7e24578)
@alcaliva alcaliva removed the async-2024-pp-apass1 Request porting to async-2024-pp-apass1 label Jan 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
async-2023-pp-apass4 Request porting to async-2023-pp-apass4 async-2024-ppRef-apass1
Development

Successfully merging this pull request may close these issues.

4 participants