Skip to content
Snippets Groups Projects

Jet/MET updates for R22 AnalysisBase

Merged William Keaton Balunas requested to merge wbalunas/athena:abmaster-200916 into master

This makes a few updates which are needed to build AnalysisBase in release 22 (see ATLASG-1549), particularly the Jet/MET analysis algorithms. Changes are:

  • Added Jet and MET analysis algorithm packages to AnalysisBase.
  • JetCalibrationAlg now uses the new jet calibration interface. No preselection or out-of-validity handling is needed, so these are removed.
  • METHelpers.h has been reinstated, for functions like buildMETSum(...). These had been moved into METMaker and METRebuilder, but had no dependence on the actual classes and are more useful to have independently. I've also propagated this to other packages which were using the class-based functions.
  • The handling of MissingETAssociationMap has been updated to use our release 22 interface with the new helper class in METMakerAlg.
  • METSignificance has been ported from release 21. The option for Run-1-style handling of the JER has been removed, as it was obsolete. WIP: I'm still having some trouble getting this to compile properly as it introduces several new dependencies. In particular I can't seem to get it to find (at least) ElectronPhotonFourMomentumCorrection/​EgammaCalibrationAndSmearingTool.h despite including that package in CMakeLists.txt. Generally I wouldn't want to include a concrete tool header like that, but it contains a needed function which just lives in the xAOD namespace for some reason (xAOD::get_eta_calo(...)).
  • Made combinedP4FromRecoTaus::getCaloResolution(...) public in tauRecTools, as it's required for the MET significance calculation. It was public in the past, and presumably someone changed it not knowing there was an external dependence.

@krumnack - Maybe you want to take over from here, since you can probably figure out the remaining dependency issues more easily than me (or at least point out the issue, as I'm a bit stumped)? I've just been attempting to compile it in the current Athena (as opposed to AB) since METUtilities is also needed there.

Tagging also @khoo, @sawyer, @cdelitzs, @sschramm (and @mswiatlo since he's taking over for Steven soon) for their awareness.

Edited by Michele Faucci Giannelli

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
  • Hi @wbalunas,

    I made one minor technical comment, but apart from that I don't see a reason not to remove the WIP status and try to get this into the release.

    Though if the MetAnalysisAlgorithms and JetAnalysisAlgorithms packages now actually compile in AnalysisBase, you should update the package_filters.txt file accordingly, by removing these two lines: https://gitlab.cern.ch/atlas/athena/-/blob/master/Projects/AnalysisBase/package_filters.txt#L11-12

    This may lead to the unit tests failing in CI. Either fix them or comment them out in the CMakeLists.txt files, and add a comment that these unit tests are temporarily disabled and need to be fixed as part of the migration from 21.2 to master.

    Cheers, Nils

  • PS: If you don't want to mess with the package_filters.txt I will take care of that once this gets merged, but if you could handle that it may streamline things and be more efficient.

  • added 1 commit

    • 734a8ac6 - Remove obsolete CMake declarations

    Compare with previous version

  • William Keaton Balunas resolved all threads

    resolved all threads

  • added 2 commits

    • 45638753 - MET updates for AB compatibility
    • 39cd2a1e - Add Jet/MET analysis algs to AnalysisBase

    Compare with previous version

  • William Keaton Balunas unmarked as a Work In Progress

    unmarked as a Work In Progress

  • William Keaton Balunas changed the description

    changed the description

  • This merge request affects 8 packages:

    • PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms
    • PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms
    • PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools
    • PhysicsAnalysis/JetMissingEtID/MissingEtDQA
    • Projects/AnalysisBase
    • Reconstruction/MET/METInterface
    • Reconstruction/MET/METUtilities
    • Reconstruction/tauRecTools

    Adding @goetz ,@martindl ,@krumnack ,@xiaozhon ,@pagessin ,@akraszna ,@adbailey ,@tadej ,@rbianchi as watchers

  • Thanks for the suggestion @krumnack - I've gone ahead and gotten it to compile in AnalysisBase as well, so I've added those two packages back into the build for that now. I'll see what needs updating in the CI tests when they finish here and then take a look at that.

  • :negative_squared_cross_mark: CI Result FAILURE (hash 39cd2a1e)

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

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