Skip to content
Snippets Groups Projects

Optimization and Clear definition for the Tile-Muon coincidence (ATR-21107)

Merged Junpei Maeda requested to merge junpei/athena:devTileMuonCoincidence into master

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 as TGCTriggerDbAlg::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 of TGCSector 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 option TILEMU=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.

Edited by Junpei Maeda

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Junpei Maeda changed title from WIP: Optimization and Clear definition for the Tile-Muon coincidence to WIP: Optimization and Clear definition for the Tile-Muon coincidence (ATR-21107)

    changed title from WIP: Optimization and Clear definition for the Tile-Muon coincidence to WIP: Optimization and Clear definition for the Tile-Muon coincidence (ATR-21107)

  • Junpei Maeda marked this merge request as ready

    marked this merge request as ready

  • 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

    Adding @junpei ,@afaulkne as watchers

  • Junpei Maeda marked this merge request as draft

    marked this merge request as draft

  • :white_check_mark: CI Result SUCCESS (hash fef3dd98)

    Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :white_check_mark: AthAnalysis: number of compilation errors 0, warnings 0
    :white_check_mark: DetCommon: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 30046]

  • removing L1 label while a Draft. -Mike (L1)

  • Junpei Maeda added 3 commits

    added 3 commits

    • f30939af - recovered default constructor by misimplementation
    • aae7698d - removed some comment lines
    • 55998cb4 - The map pointer propagation by database manager is moved from TGCSector to...

    Compare with previous version

  • Junpei Maeda added 1 commit

    added 1 commit

    • 914dae55 - The name of TileMuCoincidenceMap is changed to Run2TileMuCoincidenceMap for future implementation

    Compare with previous version

  • Junpei Maeda added 4 commits

    added 4 commits

    • 8851ea53 - remove an argument which accidentaly added to the default constructor
    • 270f2bdc - add TileMuCoincidenceLUT as Run-3 Tile-LUT
    • f5365787 - removed CW version option which is no more available since Git migration,...
    • 2a2a3c9f - changed the class name of Run2 Tile-CW

    Compare with previous version

  • Junpei Maeda changed the description

    changed the description

  • Author Developer

    Jenkins please retry a build

  • :pencil: :pushpin: build area is cleaned as the previous build was for the MR labeled as full-build

  • This 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

    Adding @junpei ,@afaulkne as watchers

  • :white_check_mark: CI Result SUCCESS (hash 2a2a3c9f)

    Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    make :warning: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view
    :warning: Athena: number of compilation errors 0, warnings 1
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :white_check_mark: AthAnalysis: number of compilation errors 0, warnings 0
    :white_check_mark: DetCommon: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 30117]

  • Junpei Maeda added 1 commit

    added 1 commit

    • d5951f3d - Run-2 Tile-Muon coincidence map is read from CONDDB only. The text file is not stored.

    Compare with previous version

  • Junpei Maeda added 3 commits

    added 3 commits

    Compare with previous version

  • Junpei Maeda changed the description

    changed the description

  • Junpei Maeda added 1 commit

    added 1 commit

    • e0acf12d - assigned proper type of fucntions

    Compare with previous version

  • Junpei Maeda added 1 commit

    added 1 commit

    • 373bfbc3 - same algorithm as firmware, as separated hitTileMu function for Tile-Muon coincidence

    Compare with previous version

  • Junpei Maeda added 1 commit

    added 1 commit

    • 79b0471b - improved implementation of TMDB things. follows the ATLAS naming convention

    Compare with previous version

  • Junpei Maeda changed the description

    changed the description

  • Junpei Maeda marked this merge request as ready

    marked this merge request as ready

  • 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

    Adding @junpei ,@afaulkne as watchers

  • :white_check_mark: CI Result SUCCESS (hash 79b0471b)

    Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :white_check_mark: AthAnalysis: number of compilation errors 0, warnings 0
    :white_check_mark: DetCommon: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 30192]

  • Changes look fine, tests pass. L1 approving.

  • added review-approved label and removed review-pending-level-1 label

  • merged

  • Edward Moyse mentioned in commit 94914241

    mentioned in commit 94914241

Please register or sign in to reply
Loading