Add Trd2d for event building
The MR is aimed at fixing a problem appeared for the Trd2d with the advent of mCBM 2021 data taking but affecting the whole TRD group on the longer run; namely the accommodation of 2 pad-plane pick-up electrode topologies (rectangular and triangular) operated by 2 types of FEEs (SPADIC and FASP). Since this is a particularity of only the TRD system the modifications are somehow wider affecting tangentially also parts of the general steering code.
Basically the MR aims at the following :
- Extend functionality of BuildRawEvents (Algo/Task) to incorporate also data from Trd2d
- Add data descriptors for Trd2d in the CbmDefs
- add a proposal for a steering script for event building for mcbm 2021
Merge request reports
Activity
added 1 commit
- f7449cd6 - disable clang-format check until macro is approved
added 45 commits
-
f7449cd6...7e110f6f - 39 commits from branch
computing:master - cbe9f7b6 - add Trd2d support for event building based on BuildRawEvents class
- 968af4bc - add Adrian Weber building event script and some steering additions
- 5eee2499 - disable clang-format check until macro is approved
- 08d20e66 - Force GetBranchName on all system digi. Adapt CbmDigiManager for a more
- 333cca2d - rename class TrdModuleRecT TrdModuleRec2D to align to official
- 2b01feba - delete old named files
Toggle commit list-
f7449cd6...7e110f6f - 39 commits from branch
added 20 commits
-
2b01feba...47c4accf - 13 commits from branch
computing:master - c22ed9ee - add Trd2d support for event building based on BuildRawEvents class
- d8c472a3 - add Adrian Weber building event script and some steering additions
- 0706154b - disable clang-format check until macro is approved
- e38576a2 - Force GetBranchName on all system digi. Adapt CbmDigiManager for a more
- 58680318 - rename class TrdModuleRecT TrdModuleRec2D to align to official
- 8a96c8a7 - delete old named files
- dabe725d - take into account both flavours of chamber designs (1D and 2D) and both FEE...
Toggle commit list-
2b01feba...47c4accf - 13 commits from branch
added 12 commits
-
e45a512b...5aaa8792 - 3 commits from branch
computing:master - 852d79b6 - add Trd2d support for event building based on BuildRawEvents class
- 1d44d9ea - add Adrian Weber building event script and some steering additions
- 5249b44b - disable clang-format check until macro is approved
- aedf4d2a - Force GetBranchName on all system digi. Adapt CbmDigiManager for a more
- 26152126 - rename class TrdModuleRecT TrdModuleRec2D to align to official
- 3d147393 - delete old named files
- 4bc4172e - take into account both flavours of chamber designs (1D and 2D) and both FEE...
- 1c0d8a1f - fix clang format warnings
- 47944d63 - remove Trd2d from the list of default loaded detectors in BuildRawEvents
Toggle commit list-
e45a512b...5aaa8792 - 3 commits from branch
Dear @f.uhlig, @v.friese, @p.-a.loizeau, @v.singhal, @c.muentz, @m.deveaux, @a.bercuci, @p.kaehler, @d.smith,
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
Hi all,
Here is yet another short explanation of the purpose of this list of commits with the request for you to tell me your opinion.
The TRD detector has to flavors of chambers TRD-1D (rectangular read-out pads) and TRD-2D (triangular read-out pads) and also two types of FEE based on SPADIC chip and respectively FASP. This situation makes such decision as e.g. which digi branch to be loaded by the CBmDigiManager different from the other detectors as both the systemId and the digiBranchName are important in order to pick the right combination. I remind you that for the mCBM2021 we have run the following: TRD-1D / SPADIC TRD-2D / SPADIC TRD-2D / FASP but we also intend to run TRD-1D / FASP in the future.
All the modifications proposed here are meant to accommodate such combinations within the framework already established for digi loading with, what I think, minor changes.
Please let me know if you agree to such a proposal so that the TRD-2D reconstruction can be also added to the mCBM tracking
Best Alex
Resolved by Pierre-Alain LoizeauSeems fine to me, also did not spot anything when looking at the digi classes and event building part of the modifications.
If the principle of the MR is approved by the others (I guess at least somebody from the event building developers and somebody from TRD), could you please also add similar modifications as what you did in the
Taskandmacroin the MQ device?It should be mostly a
copy/paste/modifyof the TRD lines and the sources would be at- Last reply by Pierre-Alain Loizeau
added 1 commit
- 24943dc7 - update the MQ framework for the Trd2d digi (asked by Pierre)
added 20 commits
-
24943dc7...aec14c0a - 6 commits from branch
computing:master - b0be39f4 - add Trd2d support for event building based on BuildRawEvents class
- fd0f7ce1 - add Adrian Weber building event script and some steering additions
- 5bf87b06 - disable clang-format check until macro is approved
- a185ffd0 - Force GetBranchName on all system digi. Adapt CbmDigiManager for a more
- fd957c3d - rename class TrdModuleRecT TrdModuleRec2D to align to official
- 86f6c1d0 - delete old named files
- 9c285ecc - take into account both flavours of chamber designs (1D and 2D) and both FEE...
- cfbef8a5 - fix clang format warnings
- 2c10041a - remove Trd2d from the list of default loaded detectors in BuildRawEvents
- 649a426b - update the MQ framework for the Trd2d digi (asked by Pierre)
- 785e06f1 - extend time representation for clusters to accomodate long (mCBM21) time
- 4c1c2424 - nomenclature changes reflecting the possibility of having different
- 99e20f74 - add configuration options to the TrdModule to accomodate various
- f7252483 - update reco frame for the 2 chamber x 2 FEE operation mode
Toggle commit list-
24943dc7...aec14c0a - 6 commits from branch
added 1 commit
- fd657e6f - fix initialization of default task configuration
added 17 commits
-
ace65b25 - 1 commit from branch
computing:master - 2916c58b - add Trd2d support for event building based on BuildRawEvents class
- 090e1196 - add Adrian Weber building event script and some steering additions
- 68ee7157 - disable clang-format check until macro is approved
- 61fe7c26 - Force GetBranchName on all system digi. Adapt CbmDigiManager for a more
- f75c3b94 - rename class TrdModuleRecT TrdModuleRec2D to align to official
- fd945064 - delete old named files
- 2a899843 - take into account both flavours of chamber designs (1D and 2D) and both FEE...
- 23783b54 - fix clang format warnings
- 43454ca7 - remove Trd2d from the list of default loaded detectors in BuildRawEvents
- 9deda4ef - update the MQ framework for the Trd2d digi (asked by Pierre)
- e09f3713 - extend time representation for clusters to accomodate long (mCBM21) time
- 5473e533 - nomenclature changes reflecting the possibility of having different
- 91e29cab - add configuration options to the TrdModule to accomodate various
- 1dc77a6c - update reco frame for the 2 chamber x 2 FEE operation mode
- 1d14c0ed - fix initialization of default task configuration
- 7a02d3bf - fix broken pipeline for macOS
Toggle commit list-
ace65b25 - 1 commit from branch
137 137 } 138 138 139 139 //____________________________________________________________________ 140 bool CbmTrdCluster::Merge(CbmTrdCluster* second) 140 bool CbmTrdCluster::Merge(CbmTrdCluster* second, bool typ) 141 141 { 142 142 if (GetRow() != second->GetRow()) return false; 143 143 // time difference condition 144 144 if (fNCols == 1 || second->fNCols == 1) { 145 if (abs(second->fStartTime - fStartTime) > 50) return false; 145 if (abs(int32_t(second->fStartTime - fStartTime)) > 50) return false; 146 146 } 147 else if (abs(second->fStartTime - fStartTime) > 20) 147 else if (abs(int32_t(second->fStartTime - fStartTime)) > 20) - Resolved by Volker Friese
I cannot really comment on the TRD-specific code (reco/detectors/trd), but I cannot help feeling that the price of having TRD-1D and TRD-2D under one software roof is increasing in terms of code complexity.
The rest looks ok from my point of view. I will request a review by @d.smith concerning the event building part.
- Last reply by Alexandru Bercuci
