Laily Sultanaliyeva (5014b0b0) at 18 Dec 14:51
With new update the container with two track candidate (BPHY22DiTrkCandidates) will be stored in the output files.
Laily Sultanaliyeva (5014b0b0) at 14 Dec 16:20
BPHY22: adding container to the output
... and 27572 more commits
Now container BPHY22DiTrkCandidates is stored in the output DAODs.
Laily Sultanaliyeva (24a50ea2) at 08 Dec 18:33
Merge branch 'Trig8_jetChain_RoIs' into 'main'
... and 78880 more commits
Dear @tstreble ,
It seems that my branch is way too much behind the 21.2. Too many conflicts to resolve, and I'm afraid I will mess it up. I think I will delete my branches and create a new one up to date, and will try to do the merging once again. Since it will be a different branch this MR should be closed. Thank you for your help.
Best, Laily
Hi @tstreble
Thanks a lot!
to rebase on top of 21.2
It didn't even register in my mind. I will try to rebase to 21.2 now.
Best,
Laily
Dear @tstreble , Thanks! Can I clarify some things (I'm not super confident with git operations). On the doc page it's said to rebase to upstream/main, doing that I receive a fatal of non-existing upstream. I checked that instead of main there is a master branch, so I'm doing rebase upstream/master. Then I see a conflict with file which I didn't use at all
CONFLICT (modify/delete): InnerDetector/InDetConditions/PixelConditionsServices/src/PixelByteStreamErrorsSvc.cxx deleted in HEAD and modified in e342d870 ('CMakeLists.txt' (PixelConditionsServices-00-24-28)). Version e342d870 ('CMakeLists.txt' (PixelConditionsServices-00-24-28)) of InnerDetector/InDetConditions/PixelConditionsServices/src/PixelByteStreamErrorsSvc.cxx left in tree. error: could not apply e342d870... 'CMakeLists.txt' (PixelConditionsServices-00-24-28)
git status shows unmerged paths:
deleted by us: InnerDetector/InDetConditions/PixelConditionsServices/src/PixelByteStreamErrorsSvc.cxx
I'm not sure how to proceed in order to not break anything. If you could help me resolve this.
Best, Laily
Now container BPHY22DiTrkCandidates is stored in the output DAODs.
Laily Sultanaliyeva (f7531773) at 06 Dec 15:30
BPHY22: added container with two-tracks candidates
Laily Sultanaliyeva (f9758fb7) at 23 Aug 00:57
Laily Sultanaliyeva (193818b0) at 23 Aug 00:55
BPHY22
Hi @skorn , thanks! I've reviewed your comments and implemented them in the code.
Hi @skorn , thanks for the input. I'm keeping these lines (and similar ones in diff part of the code) just in case I'd want to rewrite this check.
Laily Sultanaliyeva (9d61086d) at 22 Aug 11:27
Merge branch '21.2' into 'bphy22_test2.2'
... and 549 more commits
BPHY22.py Three reconstruction modes B->MuDp, B->MuDs and B->MuLambda_c are removed from the BPHY22.py. Now BPHY22 only performs reconstruction for MuDpst decay mode. This does not affect other groups, which only uses B->MuDpst mode. Container BPHY22DiTrk is reintroduced in the working flow, as it contains crucial information, and, taking into account removed containers for Ds, Dp and Lambda_c, it should not cause problems with the output size.
MuPlusDpstCascade.cxx(.h) Additional cascade fit introduced for the succeeded vertices. Now after main cascade fit one more InDet track is added to the vertex. For each successfull B vertex there might be several additional fits with track. Additional vertices are stored in separate container and do not affect main cascade fit and the way it's stored.
Laily Sultanaliyeva (778b4716) at 21 Aug 18:54
Changes in B->MuDpstX mode reconstructions