Cleanup of CbmTofSimpClusterizer (with histograms).
@v.friese @f.uhlig @p.-a.loizeau
This is a cleaned up version of the class CbmTofSimpClusterizer. It is drastically shorter than the original version. I initially thought of this as purely precursor work for the porting to the algo namespace, but now think it may be a good idea to release a replacement for the offline class as well, as the existing version is in a particularly bad state.
Unfortunately I removed all of the histograms from this class. I will now attempt to put them back in. Looking through the output of the class, I see that lots of them are empty. I can probably reconstruct which histograms are actually filled and which aren't, but some feedback from TOF experts would be nice. We might not need to support all of the histograms.
P.S.: Sorry for being so blunt. No offense meant to anyone.
Update: Histograms are back in. Ready for merge.
Merge request reports
Activity
This should be seen with @n.herrmann as he is the one who worked on it most recently and expanded it for real data (calibration and corrections among other things).
As far as I know this version should also be close to his following my merge efforts in June, but we should make sure of that in order not to block the convergence of the mCBM analysis development to something that can be merged in the master
added 62 commits
-
ddf3da29...dd928dc0 - 42 commits from branch
computing:master
- 3ace6abd - CbmTofSimpClusterizer: Removed some commented-out code.
- abdb3461 - CbmTofSimpClusterizer: Removed some QA histos.
- 225cdfab - CbmTofSimpClusterizer: Removed more histograms.
- 7af8bbdf - CbmTofSimpClusterizer: Deleted more stuff.
- 7dea0884 - CbmTofSimpClusterizer: Deleted more stuff.
- 5e35f4ff - CbmTofSimpClusterizer: More cleanup.
- 7db06007 - CbmTofSimpClusterizer: More cleanup.
- a31a4500 - CbmTofSimpClusterizer: More cleanup.
- 64ec1c8b - CbmTofSimpClusterizer: Refactoring.
- f8860c81 - CbmTofSimpClusterizer: More refactoring.
- 379e4ff5 - CbmTofSimpClusterizer: More cleanup.
- 9b958b0f - CbmTofSimpClusterizer: Wrapped cluster data in a struct.
- ab852bb9 - CbmTofSimpClusterizer: Removed DelTof arrays and histos as they don't seem to be used anywhere.
- 37964859 - CbmTofSimpClusterizer: More simplifications.
- 468a324d - CbmTofSimpClusterizer: More simplifications.
- 383afd83 - CbmTofSimpClusterizer: More simplifications.
- 05a22d61 - CbmTofSimpClusterizer: More simplifications.
- 3ab6ff40 - CbmTofSimpClusterizer: More simplifications.
- 67df49cc - CbmTofSimpClusterizer: Cleaned up Euclidean transformations some.
- 18b50b91 - CbmTofSimpClusterizer: Reintroduced many histograms.
Toggle commit list-
ddf3da29...dd928dc0 - 42 commits from branch
Dear @n.herrmann, @i.deppner,
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 22 commits
-
b8e7c546 - 1 commit from branch
computing:master
- 479878c2 - CbmTofSimpClusterizer: Removed some commented-out code.
- 6fb82f6b - CbmTofSimpClusterizer: Removed some QA histos.
- 7e631c88 - CbmTofSimpClusterizer: Removed more histograms.
- dcc25cd4 - CbmTofSimpClusterizer: Deleted more stuff.
- ba8d1be9 - CbmTofSimpClusterizer: Deleted more stuff.
- 99378455 - CbmTofSimpClusterizer: More cleanup.
- dbcb4e93 - CbmTofSimpClusterizer: More cleanup.
- a37ceb75 - CbmTofSimpClusterizer: More cleanup.
- 158db06c - CbmTofSimpClusterizer: Refactoring.
- 733c01ab - CbmTofSimpClusterizer: More refactoring.
- 7e8dc186 - CbmTofSimpClusterizer: More cleanup.
- fea9711c - CbmTofSimpClusterizer: Wrapped cluster data in a struct.
- 64174034 - CbmTofSimpClusterizer: Removed DelTof arrays and histos as they don't seem to be used anywhere.
- a96f5596 - CbmTofSimpClusterizer: More simplifications.
- 9feddce7 - CbmTofSimpClusterizer: More simplifications.
- 78393ed7 - CbmTofSimpClusterizer: More simplifications.
- ba5fd10f - CbmTofSimpClusterizer: More simplifications.
- f553ad15 - CbmTofSimpClusterizer: More simplifications.
- cd40d8a4 - CbmTofSimpClusterizer: Cleaned up Euclidean transformations some.
- c216a6c7 - CbmTofSimpClusterizer: Reintroduced many histograms.
- 145b573b - CbmTofSimpClusterizer: Removed all outdated histograms.
Toggle commit list-
b8e7c546 - 1 commit from branch
Ok, so I reintroduced all histograms of the original class. Then I looked through the original class and identified all of the histograms which weren't used any longer. Most of these were the ones that compared clusters to Tof points. They mostly referred to code which was commented out or marked as outdated. All of these were removed in the new class.
I then compared the remaining histograms between the old and the new class, and found that they coincide.
I think this is ready for merging. Removing the WIP flag.
@p.-a.loizeau @n.herrmann @i.deppner I removed some of the "LOG(debug)" messages. There might be a need for these, I cannot judge. If so, they can be reintroduced.
requested review from @n.herrmann
assigned to @p.-a.loizeau
mentioned in merge request !913 (closed)
As far as I know the
CbmTofSimpClusterizer
is used only for simulations of the main CBM setup and should not interfere with the mCBm simulation or real data analysis as they both use theCbmTofEventClusterizer
.
So merging it should not bring troubles.Also from what I could see yesterday @zhangqn17_AT_mails.tsinghua.edu.cn was making her own histograms based on TOF points, so probably nobody is using these plots at the moment.
@n.herrmann Could you please confirm so that we can merge this one?
Edited by Pierre-Alain Loizeaumentioned in merge request !955 (merged)
added 192 commits
-
145b573b...88ba3420 - 170 commits from branch
computing:master
- 7a60cc7e - CbmTofSimpClusterizer: Removed some commented-out code.
- 9688e0ee - CbmTofSimpClusterizer: Removed some QA histos.
- 0cdfe43f - CbmTofSimpClusterizer: Removed more histograms.
- 5a054cc5 - CbmTofSimpClusterizer: Deleted more stuff.
- e34a2095 - CbmTofSimpClusterizer: Deleted more stuff.
- f0d2be7d - CbmTofSimpClusterizer: More cleanup.
- bb52fbe3 - CbmTofSimpClusterizer: More cleanup.
- f3e7c523 - CbmTofSimpClusterizer: More cleanup.
- 9c0c7f90 - CbmTofSimpClusterizer: Refactoring.
- d51ede5f - CbmTofSimpClusterizer: More refactoring.
- e078bfb0 - CbmTofSimpClusterizer: More cleanup.
- d5f7c7cc - CbmTofSimpClusterizer: Wrapped cluster data in a struct.
- a9a17c46 - CbmTofSimpClusterizer: Removed DelTof arrays and histos as they don't seem to be used anywhere.
- 1eb38146 - CbmTofSimpClusterizer: More simplifications.
- dad99f38 - CbmTofSimpClusterizer: More simplifications.
- be631cd3 - CbmTofSimpClusterizer: More simplifications.
- aa5e7319 - CbmTofSimpClusterizer: More simplifications.
- 26128ad1 - CbmTofSimpClusterizer: More simplifications.
- 13a9c591 - CbmTofSimpClusterizer: Cleaned up Euclidean transformations some.
- 3bc76d03 - CbmTofSimpClusterizer: Reintroduced many histograms.
- 657f0084 - CbmTofSimpClusterizer: Removed all outdated histograms.
- c18081b1 - CbmTofSimpClusterizer: Fixed bug in digi calibration.
Toggle commit list-
145b573b...88ba3420 - 170 commits from branch
- Resolved by Pierre-Alain Loizeau
@d.smith @p.-a.loizeau Norbert seems not to be responsive. How shall we proceed here?