Skip to content
Snippets Groups Projects

NSW Simulation - Moving to AthReentrantAlgorithm class for MT processing

Merged Francesco Giuseppe Gravili requested to merge fgravili/athena:reentrant into master

And finally here it is the so long-awaited MR (please, forgive me as it is a quite big one, but there's a tight schedule! The other changes for MM algorithms done in !53093 (merged) ): as far as I understood, the deadline is at the end of this week, if we want to have it in the upcoming MC bulk production.

The NSWL1Simulation steering class is now moving to AthReentrantAlgorithm for athenaMT processing: as far as I know, it is ok to keep the other detector technology classes (the ones being called) as AthAlgTool.

Main changes listed below:

  • All function (and sub-functions from the derived classes!!!) called from NSWL1Simulation::execute method are declared as const. I commented some pieces of the NSWL1Simulation code: they're not used at the moment, but on the other side they're not yet ready for the integration in AthReentrantAlgorithm; I'll update them later on, if needed, otherwise I'll remove them
  • Removed forward declarations, redundant if the corresponding header file is available
  • PadTriggerLogicOfflineTool, L1TdrStgcTriggerLogic and PadTriggerValidationTree classes (with extra changes as never adapted to Rel22 standards):
    • declareProperty instances replaced by Gaudi::Property
    • Moved include declarations to header file and removed duplicates
    • Clean-up of variables/functions/comments not used or not useful to understand the code
    • Used std:: namespace for formulas and removed deprecated TVector3 instances
    • Improved code readability: fixed alignment and indentations, expanded tabs->spaces
    • For L1TdrStgcTriggerLogic class: removed private members for an easier integration within const functions
  • PadTdsValidationTree class: replaced m_nPadTriggers variable with a std::vector to avoid overriding here
  • StripSegmentTool class: moved LUT call function for each event, removing the 3 std::pair private members, to avoid issues with the const mother function
  • A few variables are defined as mutable: they're only there for debugging purposes, as related to the validation ntuple
  • MMT_Hit class: R position from global coordinates (one line change)
  • MMT_Road class: range based for-loop with variable passed by reference, avoiding copy (one line change)

./cc a few people who might be interested in:

Merge request reports

Checking pipeline status.

Approval is optional

Merged by Vakhtang TsulaiaVakhtang Tsulaia 2 years ago (May 16, 2022 6:59pm UTC)

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • :pencil: :scissors: The system determined that CI tests (with names matching "^CITest_SimulationRun(2|3)FullSim.*$") are not needed for this code change. They are not run. This is not an indicator to restart the job.

  • :white_check_mark: CI Result SUCCESS (hash cace55be)

    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. Check the JIRA CI status board for known problems
    :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 52053]

  • I'll wait in case there're other comments from L1 (and/or L2), before submitting the changes suggested by @tamartin and @rbielski

    Update: Comments have been addressed, in order to trigger the pipeline during the night

    Edited by Francesco Giuseppe Gravili
  • added 2 commits

    • d5e06352 - Removed event and run number private members
    • 4ad438be - Replaced dynamical std::vector building with constexpr static declarations

    Compare with previous version

  • This merge request affects 2 packages:

    • Trigger/TrigT1/TrigT1NSW
    • Trigger/TrigT1/TrigT1NSWSimTools

    Affected files list will not be printed in this case

    Adding @jchapman ,@afaulkne as watchers

  • resolved all threads

  • :pencil: :scissors: The system determined that CI tests (with names matching "^CITest_SimulationRun(2|3)FullSim.*$") are not needed for this code change. They are not run. This is not an indicator to restart the job.

  • :white_check_mark: CI Result SUCCESS (hash 4ad438be)

    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. Check the JIRA CI status board for known problems
    :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 52077]

  • Kira Abeling
  • Kira Abeling
  • Only a few comments regarding commented code and the change of code abortion. CI appears to fine. Will also pass on to L2 for a second pair of eyes to cross check that I didn't miss anything.

    Kira (L1)

  • added 2 commits

    • 5ffa896d - Demoted output message to warning
    • 347bcc0f - Changed control check using ATH_CHECK

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading