Skip to content
Snippets Groups Projects

Sweep DerivationFrameworkMuons from 21.2 to master

All threads resolved!

This sweeps DerivationFrameworkMuons from 21.2 to master, where 21.2 took precedence in merging conflicts.

It includes an additional change for CaloTrkMuIdTools by splitting a shared library and component library in order to make the DerivationFrameworkMuons package complie.

Some const-corretness changes were also kept from master in the MuonTPExtrapolationTool

@nkoehler PTAL

MR !32221 (closed) is not needed anymore

Edited by Lukas Alexander Heinrich

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
  • added 1 commit

    Compare with previous version

  • This merge request affects 1 package:

    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons
  • CI Result FAILURE (hash bb086d5c)

    Athena AthSimulation AnalysisBase AthGeneration
    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
    AnalysisBase: number of compilation errors 0, warnings 0
    AthGeneration: number of compilation errors 0, warnings 0
    📝 For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 12674]

  • CI Result SUCCESS (hash cbc549dd)

    Athena AthSimulation AnalysisBase AthGeneration
    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
    AnalysisBase: number of compilation errors 0, warnings 0
    AthGeneration: number of compilation errors 0, warnings 0
    📝 For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 12691]

  • added urgent label

  • Hi,

    adding the urgent label as this is needed for doing physics validation in release 22, so it is now critical for the data processing schedule.

    Adding @nicolaid @smwang

    James.

  • Matt LeBlanc resolved all threads

    resolved all threads

  • This one can go ahead, the CI looks good and it is a (manual) sweep.

    MLB (L1)

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

  • mentioned in commit f5e08136

  • Please register or sign in to reply
    Loading