TOF update with MC Match support in CbmTofEventClusterizer

New MC match vector TofCalDigiMatch for time sorted TofCalDigis, update of Calibration scheme in CbmTofCalibrator, various TOF internal macro changes

Dear @n.herrmann, @i.deppner, @f.uhlig, @p.-a.loizeau,

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

approved this merge request

assigned to @v.friese

assigned to @p.-a.loizeau and unassigned @v.friese

added 12 commits

• b9586add...4740197f - 5 commits from branch computing:master
• 271d0c75 - prevent calibration update without processed events
• 7e620727 - format
• 7afb642b - various updates including EventClusterizer with MC Match support
• 796d4c34 - gauss fit around max bin for updating time offsets
• b1962019 - add updated MC point matches to output
• d5925adf - format changes
• 2b84679e - Mar2021 mapping

Compare with previous version

added 1 commit

• 9ba48a73 - add so far masked macros

Compare with previous version

added 1 commit

• 7f7c349d - insert various so far masked files

Compare with previous version

added 14 commits

• 7f7c349d...c3a119ac - 5 commits from branch computing:master
• 606b201e - prevent calibration update without processed events
• c4a4cab0 - format
• b32d1ecf - various updates including EventClusterizer with MC Match support
• 4d85bd6f - gauss fit around max bin for updating time offsets
• bd2ed281 - add updated MC point matches to output
• f479d929 - format changes
• f0f40860 - Mar2021 mapping
• 1d54188f - add so far masked macros
• 938fa7b6 - insert various so far masked files

Compare with previous version

@n.herrmann

After trying to merge the match part of your MR to my existing debug branch for MR !227 (merged), I found out that more changes (array names, MatchRecoToMc support, ...) were needed to get everything running.

I pushed the final version to MR !227 (merged) if you want to have a look (it should fit at ~95% with your changes to CbmTofEventClusterizer).

I only now saw that in the meantime you tried to recover this MR in parallel, sorry for this.

added 1 commit

• 8b1c6f78 - forgotten files

Compare with previous version

added 2 commits

• bba1a667 - temporary removal of COSY2019
• 49829d35 - add cosy2019

Compare with previous version

added 1 commit

• f3b6c766 - update macro

Compare with previous version

added 1 commit

• 8335e9ea - format macro

Compare with previous version

added 1 commit

• 3b643b07 - fix forgotten files

Compare with previous version

added 1 commit

• 9cfa5521 - restore original version

Compare with previous version

@n.herrmann,

your changes in fles/mcbm2018 undo changes introduced with !216 (merged). You simply recreate files which were either removed or moved to other directories. I don't understand how it comes to this situation and why this isn't catched by our CI pipeline.

@n.herrmann,

the files come in with commit 938fa7b6. The commit message indicates that a rebase was done at that point. It can't be a simple rebase to upstream/master. Can't you recall which command you did exactly.

mentioned in merge request !227 (merged)

The problem was introduced by me finding the .gitignore that had bothered me since quite a while. When removed several outdated files got into my origin repository. Should be fixed by now.

@n.herrmann,

unfortunately the issue is not fixed. If you check the 74 changes in this commit you see that the commit add several files which shouldn't exist any longer.

How do I find the ones that should be removed?

added 2 commits

• 33023bca - cleanup obsolete files
• 92405c43 - cleanup continued

Compare with previous version

added 20 commits

• d08c3ba4 - 1 commit from branch computing:master
• 026cc034 - prevent calibration update without processed events
• 810640a1 - format
• 5cdbe25c - various updates including EventClusterizer with MC Match support
• 2e72ebc0 - gauss fit around max bin for updating time offsets
• ede6a3eb - add updated MC point matches to output
• d5f33b29 - format changes
• 90bc2607 - Mar2021 mapping
• 2d0d191d - add so far masked macros
• e637f8b7 - insert various so far masked files
• a8efb928 - forgotten files
• d7557390 - temporary removal of COSY2019
• a6d63c99 - add cosy2019
• 7a77c0ed - update macro
• 42cd70e0 - format macro
• 55fafb6c - fix forgotten files
• 0086c69b - restore original version
• 51d402c6 - cleanup obsolete files
• a3c178ea - cleanup continued
• 101298a0 - remove Hodo file

Compare with previous version

resolved all threads

Please don't update the branch currently. One of our test machines is offline such that the pipeline will break. I will restart it pipelines when the machine is back online.

@n.herrmann,

I will take care about the MR. I will cleanup the commits and create a new merge request which should introduce the same final changes.

mentioned in merge request !271 (merged)

@n.herrmann,

I close this MR since it is superseded by !271 (merged).

closed