Skip to content
Snippets Groups Projects

CaloClusterCorrection: Switch cluster corrections to ToolWithConstants.

Merged CaloClusterCorrection: Switch cluster corrections to ToolWithConstants.
ssnyder/athena:toolConstants.CaloClusterCorrection-20200606 into master
All threads resolved!
Merged Scott Snyder requested to merge ssnyder/athena:toolConstants.CaloClusterCorrection-20200606 into master
All threads resolved!

Switch the cluster correction classes from ToolWithConstantsMixin to ToolWithConstants.

The metatool (CaloRunClusterCorrections) does not yet work with the new class, so it has been disabled. This implies that one cannot configure the list of corrections from only a cool tag. In many cases, though, the cool tag had already been replaced by a static version. For now, adjust the configuration so that we always use a static configuration, rather than the tag. This should be revisited later.

The configuration scripts also need some further cleanup, to be done in a future change.

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
  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :negative_squared_cross_mark: CI Result FAILURE (hash 4d457f84)

    Athena AthSimulation AnalysisBase AthGeneration
    externals :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:
    make :o: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :o: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :cloud: :white_check_mark: :white_check_mark: :white_check_mark:

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

  • Scott Snyder added 1 commit

    added 1 commit

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 4 packages:

    • Calorimeter/CaloClusterCorrection
    • PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis
    • Reconstruction/egamma/egammaTools
    • Trigger/TriggerCommon/TriggerMenuMT

    Adding @goetz ,@pavol as watchers

  • Christos Anastopoulos resolved all threads

    resolved all threads

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :negative_squared_cross_mark: CI Result FAILURE (hash 4fd3530b)

    Athena AthSimulation AnalysisBase AthGeneration
    externals :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:
    make :o: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :o: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :cloud: :white_check_mark: :white_check_mark: :white_check_mark:

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

  • Scott Snyder added 1 commit

    added 1 commit

    • c506a38e - Fix compilation of DerivationFrameworkCalo.

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 4 packages:

    • Calorimeter/CaloClusterCorrection
    • PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis
    • Reconstruction/egamma/egammaTools
    • Trigger/TriggerCommon/TriggerMenuMT

    Adding @goetz ,@pavol as watchers

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash c506a38e)

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

  • Xiaozhong Huang
    Xiaozhong Huang @xiaozhon ·

    The changes look good to me. Considering the changes in this MR, push it to L2 for further review.

    Xiaozhong (L1)

  • Xiaozhong Huang added review-pending-level-2 label and removed review-pending-level-1 label

    added review-pending-level-2 label and removed review-pending-level-1 label

  • Scott Snyder added 1 commit

    added 1 commit

    • 850e7bba - Also need to fill in an explicit version for LArClusterMaker, now that we are...

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 5 packages:

    • Calorimeter/CaloClusterCorrection
    • LArCalorimeter/LArClusterRec
    • PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis
    • Reconstruction/egamma/egammaTools
    • Trigger/TriggerCommon/TriggerMenuMT

    Adding @goetz ,@pavol as watchers

  • ATLAS Robot added LAr review-pending-level-1 labels and removed review-pending-level-2 label

    added LAr review-pending-level-1 labels and removed review-pending-level-2 label

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash 850e7bba)

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

  • Clara Nellist
    Clara Nellist @cnellist ·
    Developer

    Sending back to L2. Clara (L1)

  • Clara Nellist added review-pending-level-2 label and removed review-pending-level-1 label

    added review-pending-level-2 label and removed review-pending-level-1 label

  • Sergio Grancagnolo resolved all threads

    resolved all threads

  • Sergio Grancagnolo resolved all threads

    resolved all threads

  • Sergio Grancagnolo resolved all threads

    resolved all threads

  • Sergio Grancagnolo resolved all threads

    resolved all threads

  • G
    Sergio Grancagnolo @grancagn ·
    Developer

    Changes look good, only minor comments. Just check if unresolved thread has to be addressed, and if in next clean-up in case.

  • Sergio Grancagnolo added review-user-action-required label and removed review-pending-level-2 label

    added review-user-action-required label and removed review-pending-level-2 label

  • Scott Snyder resolved all threads

    resolved all threads

  • Scott Snyder added review-pending-level-1 label and removed review-user-action-required label

    added review-pending-level-1 label and removed review-user-action-required label

  • G
    Sergio Grancagnolo @grancagn ·
    Developer

    Fine for me, approving.

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

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

  • Adam Edward Barton merged

    merged

  • Adam Edward Barton mentioned in commit 0c0ced59

    mentioned in commit 0c0ced59

  • Atlas Nightlybuild added sweep:ignore label

    added sweep:ignore label

  • Christos Anastopoulos mentioned in merge request !34684 (merged)

    mentioned in merge request !34684 (merged)

    • Please register or sign in to reply