Optimization and Clear definition for the Tile-Muon coincidence (ATR-21107)
To optimize the memory usage if the text file of LUT is loaded, and for further development with Run2/3 Tile-Muon coincidence, the several updates and code cleanup is needed. I implemented below:
- migrated TileMuon coincidence map from multi-dimensional arrays to
std::unordered_map
, as same asTGCTriggerDbAlg::TGCTriggerData
- separated class of CW map/LUT for Run-2/Run-3 Tile-Muon coincidence (for instance, the contents are same.)
- Run-2 TIle-Muon coincidence map is read from CONDDB only, because the DB content is valid and the text file is not available on the repository.
- The propagation of LUT object is improved. Now the each CW map/LUT is set in
TGCSectorLogic
class, instead ofTGCSector
by pointer propagation. - The switching of Tile-Muon coincidence has been fixed and
TILEMU=true
is now the default configuration. (the configuration is available for either Run-2 or Run-3). The user could add an optionTILEMU=false
, when the Tile-Muon coincidence would be forcibly disabled. - other improvements for C++ coding
Run-2 Tile-Muon coincidence has been finalized (although is still possible to improve the coding...). For the time being, the same logic is applied for Run-3 simulation.
test_trig_mc_v1Dev_L1SimOnly_phase1_build.py
and test_trig_mc_v1Dev_L1SimOnly_build.py
runs successfully.
Merge request reports
Activity
added Trigger master sweep:ignore labels
This merge request affects 1 package:
- Trigger/TrigT1/TrigT1TGC
This merge request affects 4 files:
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSectorLogic.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTileMuCoincidenceMap.h
- Trigger/TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx
- Trigger/TrigT1/TrigT1TGC/src/TGCTileMuCoincidenceMap.cxx
added review-pending-level-1 label
CI Result SUCCESS (hash fef3dd98)Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 30046]removed review-pending-level-1 label
added 1 commit
- 914dae55 - The name of TileMuCoincidenceMap is changed to Run2TileMuCoincidenceMap for future implementation
added 4 commits
Toggle commit listThis merge request affects 1 package:
- Trigger/TrigT1/TrigT1TGC
This merge request affects 17 files:
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/LVL1TGCTrigger.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/Run2TileMuCoincidenceMap.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDatabaseManager.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCGoodMF.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSector.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSectorLogic.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTileMuCoincidenceLUT.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTileMuCoincidenceMap.h
- Trigger/TrigT1/TrigT1TGC/doc/readme
- Trigger/TrigT1/TrigT1TGC/src/LVL1TGCTrigger.cxx
- Trigger/TrigT1/TrigT1TGC/src/Run2TileMuCoincidenceMap.cxx
- Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx
- Trigger/TrigT1/TrigT1TGC/src/TGCGoodMF.cxx
- Trigger/TrigT1/TrigT1TGC/src/TGCSector.cxx
- Trigger/TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx
- Trigger/TrigT1/TrigT1TGC/src/TGCTileMuCoincidenceLUT.cxx
- Trigger/TrigT1/TrigT1TGC/src/TGCTileMuCoincidenceMap.cxx
CI Result SUCCESS (hash 2a2a3c9f)Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 1
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 30117]added 1 commit
- d5951f3d - Run-2 Tile-Muon coincidence map is read from CONDDB only. The text file is not stored.
added 1 commit
- 373bfbc3 - same algorithm as firmware, as separated hitTileMu function for Tile-Muon coincidence
added 1 commit
- 79b0471b - improved implementation of TMDB things. follows the ATLAS naming convention
This merge request affects 1 package:
- Trigger/TrigT1/TrigT1TGC
This merge request affects 21 files:
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/LVL1TGCTrigger.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/Run2TileMuCoincidenceMap.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDatabaseManager.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCGoodMF.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSector.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSectorLogic.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTMDB.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTMDBOut.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTileMuCoincidenceLUT.h
- Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTileMuCoincidenceMap.h
- Trigger/TrigT1/TrigT1TGC/doc/readme
- Trigger/TrigT1/TrigT1TGC/src/LVL1TGCTrigger.cxx
- Trigger/TrigT1/TrigT1TGC/src/Run2TileMuCoincidenceMap.cxx
- Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx
- Trigger/TrigT1/TrigT1TGC/src/TGCGoodMF.cxx
- Trigger/TrigT1/TrigT1TGC/src/TGCSector.cxx
- Trigger/TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx
- Trigger/TrigT1/TrigT1TGC/src/TGCTMDB.cxx
- Trigger/TrigT1/TrigT1TGC/src/TGCTMDBOut.cxx
- Trigger/TrigT1/TrigT1TGC/src/TGCTileMuCoincidenceLUT.cxx
- Trigger/TrigT1/TrigT1TGC/src/TGCTileMuCoincidenceMap.cxx
added review-pending-level-1 label
CI Result SUCCESS (hash 79b0471b)Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 30192]added review-approved label and removed review-pending-level-1 label
mentioned in commit 94914241