Major update of LMVM Analysis

Procedures (fast simulations, event mixing with large mixing depths etc.) and histograms that were implemented and developed in the past step by step and parallel are subdivided into individual commits and summarized in them.

added 1 commit

• cfe69336 - LMVM: wip: apply clang-format

Compare with previous version

added 1 commit

• be1b42a8 - wip: clang format

Compare with previous version

added 1 commit

• 47a7b259 - wip: clang format

Compare with previous version

Is it possible to squash commits online on Gitlab? I would like to squash the last 4 commits (clang formatting). Unfortunately with 'git rebase -i', when I wanted to do small corrections due to failed pipeline during the merge request, every time only the last commit appeared such that I could not squash them.

Usually, you can squash commits when issuing the merge request. There is a button for that. But I think you can only squash all commits in a MR, not a subset.

I think you need to use git rebase -i upstream/master locally to see the full list of all commits as seen in the MR.
At least for me it typically worked.
You can then re-order and fix (f <hash>, just combine while keeping the messgae of the 1st commit)/squash (s, asks you how you want to combine the two commit messages in your default editor)

In order to find out which commits can be easily re-ordered/fused, I have a script that I attach here (git_check_for_squash.sh) which will list the modified files for each commit relative to upstream/master...
something I typically use to know if I need to split some clang-format commit (with this method) before doing the rebase
Dummy example of the output for !2102 (merged) (as few files modified and no clang format):

~/cbmsoft/cbmroot$ git_check_for_squash.sh 
34d63b390 (HEAD -> tune_nightlies_release_Jun25) Increase test time for analysis_tree_maker by 2s per event
0eb9ebea4 BugFix: OnlineRecoCanProcessTimeslice could not succeed in Nightly/Profile/Weekly test due to broken logic
88627095c Disable example of aligned geo overlap test as WONT-FIX by mCBM team for 2022 geo
                                                                   35a754998 88627095c 0eb9ebea4 34d63b390
algo/test/realdata_test.sh                                                             ....M....           | 
macro/C2F/CMakeLists.txt                                                                         ....M.... | 
macro/geometry/CMakeLists.txt                                                ....M....                     |

As a side note I restarted the 4 failed jobs, from the logs they were linked to a known network weakness of the kn12 runner where sometimes the cvmfs folders get unresponsive

Dear @a.andronic, @k.piasecki, @f.uhlig, @v.friese, @p.-a.loizeau, @se.gorbunov,

you have been identified as code owner of at least one file which was changed with this merge request.

Please check the changes and approve them or request changes.

added CodeOwners label

added 1 commit

• ba167fb8 - LMVM: Apply clang format

Compare with previous version

It worked out now. Thank you! I squashed the last 4 commits into one.

@cornelius.riesen_AT_physik.uni-giessen.de,

who should review the MR?

What is the usual procedure? I thought the code owner will check the changes.

Looking at the code owners I guess none of them really has a good understanding of the actual code. For me the list looks like the coordinators and/or admins. If you could name someone who is familiar with the topic would help a lot.

added 22 commits

• ba167fb8...f9e0943e - 13 commits from branch computing:master
• 037bc048 - Introduce 2D electron-ID cuts in CbmLitGlobalElectronID
• 2498eaa9 - LMVM: Add/correct weights for Pluto particles for 12gev
• 3c987f13 - LMVM: Introduce LmvmCBCalc for calculation of combinatorial background
• 35eefd0a - LMVM: Implement Fast Simulation procedure
• 21093764 - LMVM: method for variable bin widths of histograms
• 4766013b - LMVM: Update run macros
• ebb62e00 - LMVM: Add multiple histograms
• 48d406a9 - LMVM: Apply clang format
• b874ea7f - LMVM: small fix

Compare with previous version