fix problems introduced with MR271

MR271 did not include all classes when renaming TofCalDigiMatches to TofHitCalDigiMatches. Tof Calibration does not work any more. Most import is CbmTofCalibrator class and CbmDeviceHitBuilderTof. Other changes were enforced by getting the rebase to work, reason is not understood.

It seems that something went wrong with the rebase and that it reverted multiple files outside of the TOF code.

I tried to look at your changes and I think that the changes in this new branch (commit ddb45d21) are probably the ones you wanted to push with this MR.

Could you please confirm me if this is right or if I am still missing some instances of the TofCalDigiMatches to TofHitCalDigiMatches renaming?

added 37 commits

• 06379682...25664181 - 15 commits from branch computing:master
• 8b3eb7c0 - fix inconsistencies
• d57a4a5b - format
• 106da6de - merge
• aa7bf652 - merge
• f296f8e5 - merge
• a27f0042 - merge
• f57e6225 - insert various so far masked files
• 3e1355be - forgotten files
• 445863f8 - temporary removal of COSY2019
• dfd0d084 - add cosy2019
• 27adbacf - update macro
• f0172ae4 - format macro
• 3ed2274c - fix forgotten files
• 50dd4e55 - restore original version
• 454d17f3 - cleanup obsolete files
• b6c9321c - cleanup continued
• 7bd0b7ad - remove Hodo file
• 7f009128 - modify Buc inspection histo
• c5120e3b - merge
• 24ae5983 - merge
• 8d22e064 - merge
• 67238579 - merge

Compare with previous version

Please go ahead, the renaming still has to happen in CbmTofAnatestbeam, no time to look at it in more detail right now

I found the following usage when looking at CbmTofAnatestbeam:

fTofDigiMatchColl
=> Cleared in Exec at l. 783
=> Filled in Exec from fTofDigiMatchCollIn at l.809
=> Deleted in Exec at l.831 if hits present
=> TofCalDigiMatch used to retrieve in RegisterInputs at l.685
=> Overwritten with a new TClonesArray in RegisterInputs at l.1180
---> Used at Digi match from Hit index at l.4480, 4620, 5281, 5285, 5307, 5326, 5762, 5765, 6667, 6838
---> Used as Hit-Digi match at l. 6825, 7355


fTofDigiMatchCollIn
=> TofDigiMatch used to retrieve in RegisterInputs at l.1153
=> TofCalDigiMatch used to retrieve in RegisterInputs at l.1156

So I updated my commit to include a modification of the name from TofCalDigiMatch to TofHitCalDigiMatch at lines 685 and 1156.

I also found a similar usage in CbmHadronAnalysis at line 2970, 4077 and 5245, so I included a modification of the name at l.2970

After this I do not find TofCalDigiMatch outside of CbmMatchRecoToMC and CbmTofEventClusterizer so hopefully that should be the last places I missed.

All changes are included in MR !289 (merged)

mentioned in merge request !289 (merged)

resolved all threads

Close this MR because it was superseded by !289 (merged).

closed