Fix Tof Geometry v20a

Update inconsistent geometry creation macro

@n.herrmann,

if I am correct the only relevant file for the fix is the macro to create the geometry v20a. Could you please create a merge request with only the last commit 6a261032.

To do so please create a new branch which then is used to clean up.

git checkout -b fix_geometry_v20a

This command creates a copy of your branch official_master. To cleanup you have to do an interactive rebase. The first command gets the latests changes from the official repository. The second command will open your editor and allows you to do the cleanup.

git fetch official
git rebase -i official/master

The editor should show you something like the following text which allows you to drop all commits except the last one which fixes the geometry creation macro. Simply remove the lines with the other commits in the editor, save the changes and leave the editor.

pick c2af3a5e1 fix inconsistencies introduced by last merge
pick 8a20397b0 add DigiRate histograms
pick 5f876b95f modified treatment of T0 calibration
pick a21302b6e add option for digi rates
pick 6a2610326 fix Tof v20a geometry

# Rebase 3dbb20295..6a2610326 onto a21302b6e (5 commands)
#
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup <commit> = like "squash", but discard this commit's log message
# x, exec <command> = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop <commit> = remove commit
# l, label <label> = label current HEAD with a name
# t, reset <label> = reset HEAD to a label
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
# .       create a merge commit using the original merge commit's
# .       message (or the oneline, if no original merge commit was
# .       specified). Use -c <commit> to reword the commit message.
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

After the cleanup your branch should contain only the one commit on top of upstream/master and your log should look like

git log


commit a655394e03aec52dada335cc0c111f819d698303 (HEAD -> norbert_master)
Author: Norbert Herrmann <n.herrmann@physi.uni-heidelberg.de>
Date:   Sat Apr 17 11:27:14 2021 +0200

    fix Tof v20a geometry

commit 3dbb202954a74e86a84eefb550802b865bf7256e (upstream/nightly_master, upstream/master)
Author: Omveer <osingh@amu.ac.in>
Date:   Fri Apr 16 19:52:48 2021 +0530

    Clang Format
    
    Update for new clang-format rules.

commit ca288bf8ca19fcc3147cd5e892427cac470c185a

Now create a new merge request from this branch which will only contain the needed change.

OK, following your instructions

Thanks. The new MR looks fine. The pipeline is nearly finished. Could you also create the geometry and parameter file.

Close the merge request, since it was superseded by !308 (merged).

closed

OK, ich generiere 2 MRs