⚠️ Analysis is retired for Run 3 ⚠️
The Analysis project in Run 1/2 hosted a wide variety of packages related to nTuple production, LoKi functors and other analysis tools.
In Run 3, some of the analysis tools were either retired or moved to other projects such as Rec
or DaVinci
. The Run 3 nTuple production is a lightweight code that is hosted now in the DaVinci
project.
Analysis
is still supported for Run 1/2 analysis and production use cases in the dedicated branches, such as XXX-patches
.
These legacy branches are listed below, where changes and fixes should be committed to.
-
run2-patches
branch: New developments and updates targeting Runs 1 and 2 analysis and/or ReStripping. Builds on supported platforms against the latest version of Gaudi. -
2018-patches
branch: For 2018 incremental Stripping (S34r0pX
,S35r0pX
,S35r1pX
), 2015 and 2016 ReStripping (S24r2
,S28r2
) and patches to Stripping in 2015, 2016, 2017 and 2018 simulation workflows. Builds with gcc62 on centos7. -
stripping21-patches
branch: For run 1 incremental Stripping (S21r0pX
,S21r1pX
) and patches to Stripping in run 1 simulation workflows. Builds with gcc49 on slc6.
Move ongoing (unmerged) work to DaVinci
You can rebase your unmerged branches on top of DaVinci and open MRs there. First, add Analysis as a remote in your DaVinci clone:
git clone ssh://git@gitlab.cern.ch:7999/lhcb/DaVinci.git
cd DaVinci
git remote add Analysis ssh://git@gitlab.cern.ch:7999/lhcb/Analysis.git
git fetch Analysis
git fetch origin
And then rebase the Analysis commits in your branch (e.g. AM_test
) onto the master
of DaVinci:
# interactive rebase: you can just save the default list
git rebase -i --onto origin/master Analysis/master Analysis/AM_test
# create a new branch on the rebased commits and push
git checkout -b AM_test
git push -u origin AM_test
In case you want to rebase onto another DaVinci branch (merge a Analysis and a DaVinci MR), first rebase the DaVinci branch onto the latest master, push it, and then use the following slight variation of the rebase above:
git rebase -i --onto origin/AM_test Analysis/master Analysis/AM_test