Skip to content
Snippets Groups Projects

changed name of aux variable in jFexTowerContainer and gFexTowerContainer

Merged changed name of aux variable in jFexTowerContainer and gFexTowerContainer
(removed):change_name into 22.0
All threads resolved!
Merged Rajat Gupta requested to merge (removed):change_name into 22.0
All threads resolved!

I have changed the names of some other aux variables, which could be the cause for the clash in MR 26148. The changes are tested for any further clashes.

Edit by @bernius: to solve ATR-26148

Edited by Catrin Bernius

Merge request reports

Approval is optional

Merged by John Kenneth AndersJohn Kenneth Anders 2 years ago (Aug 18, 2022 3:03pm UTC)

Merge details

  • Changes merged into 22.0 with ffffcecb (commits were squashed).
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Rajat Gupta added 1 commit

    added 1 commit

    Compare with previous version

  • Rajat Gupta resolved all threads

    resolved all threads

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Event/xAOD/xAODTrigL1Calo

    This merge request affects 8 files:

    • Event/xAOD/xAODTrigL1Calo/Root/gFexTowerAuxContainer_v1.cxx
    • Event/xAOD/xAODTrigL1Calo/Root/gFexTower_v1.cxx
    • Event/xAOD/xAODTrigL1Calo/Root/jFexTowerAuxContainer_v1.cxx
    • Event/xAOD/xAODTrigL1Calo/Root/jFexTower_v1.cxx
    • Event/xAOD/xAODTrigL1Calo/xAODTrigL1Calo/versions/gFexTowerAuxContainer_v1.h
    • Event/xAOD/xAODTrigL1Calo/xAODTrigL1Calo/versions/gFexTower_v1.h
    • Event/xAOD/xAODTrigL1Calo/xAODTrigL1Calo/versions/jFexTowerAuxContainer_v1.h
    • Event/xAOD/xAODTrigL1Calo/xAODTrigL1Calo/versions/jFexTower_v1.h

    Adding @akraszna as watcher

  • Rajat Gupta resolved all threads

    resolved all threads

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash 405e0114)

    Athena DetCommon
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark:
    tests :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: DetCommon: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 57559]

  • Oleh Kivernyk
    Oleh Kivernyk @okiverny ·
    Developer

    Looks good to me. Approving - L1

  • Oleh Kivernyk removed review-pending-level-1 label

    removed review-pending-level-1 label

  • Oleh Kivernyk added review-approved label

    added review-approved label

  • Peter Berta added review-approved-tier0 label

    added review-approved-tier0 label

  • John Kenneth Anders added review-approved-point1 label

    added review-approved-point1 label

  • John Kenneth Anders mentioned in commit ffffcecb

    mentioned in commit ffffcecb

  • John Kenneth Anders merged

    merged

  • Catrin Bernius changed the description

    changed the description

    • Please register or sign in to reply