Skip to content
Snippets Groups Projects

DerivationFrameWorkMuons - Declare data dependencies

Merged DerivationFrameWorkMuons - Declare data dependencies
jojungge/athena:update_DerivMuons into master
Merged Johannes Junggeburth requested to merge jojungge/athena:update_DerivMuons into master
    1. commit: Clang-format all C++ classes
    1. commit: Delete CellsOfMuons, ClusterNearMuon, MuonIDCovMatrixDecorator, mcpDecorator as these are never setup in any JO. Declare data-dependencies of the MuonJetDrTool, MuonTruthClassifierFallBack
        1. commit: Refactor of the MuonTruthIsolationTool. Caching of the TruthParticles into a map chopping the container into smaller containers according to their phi sector. Declaration of decorations written by the tool. Ignore neutrinos now from the isolation.
    1. commit: Refactor the IDTrackCaloDepositsDecoratorTool. It's now an Derivation::IAugmentationTool which is no longer meant to be instantiated together with the diMuonTaggingTool. The change became necessary as we must ensure that all decorations which we want to augment are written at least one time per event. The tool can either decorate the deposits of all muons or of the ID tracks associated with them. In the latter case, the first ID track in the collection is also decorated if the muon container is empty. Actually, I do not really know whether this could cause problems if this track is then thinned from the output, but I guess not. Another very important change that I made is that the decorations are now stored in a three separate vectors containing the energy loss, deposits and the depost types, respectively. Also here the figure of merit is file-integrity as well as not wasting disk-memory if for instance no HEC modules were hit. For further post processing one must schedule an algorithm that transform the new representation back to the old one (Tagging here @dcieri explicitly)
    1. commit: Refactor the IDTrackCaloDepositsDecoratorTool. The tool has been refactored analogously to the IDTrackCaloDepositsDecoratorTool. But here no output format has changed.
    1. commit: Refactor the diMuonTaggingTool. Actually I need to have a second thought about this tool as this in the version of today should be rather a thinningtool than an augmentationtool. But let's keep the current version for now.

Tagging: @mvanadia, @gabarone, @dcieri

Closes ATLASMCP-96

Edited by Johannes Junggeburth

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
  • Johannes Junggeburth added 2 commits

    added 2 commits

    Compare with previous version

  • Johannes Junggeburth changed the description

    changed the description

  • Johannes Junggeburth added 1 commit

    added 1 commit

    • 384666d4 - Refurbish the IDTrackCaloDepositTool

    Compare with previous version

  • Johannes Junggeburth added 1 commit

    added 1 commit

    • 55f7ac54 - Refactor the track deposit tool

    Compare with previous version

  • Johannes Junggeburth added 1 commit

    added 1 commit

    • f112c04f - Refactor of the diMuonTaggingTool

    Compare with previous version

  • Johannes Junggeburth changed the description

    changed the description

  • Johannes Junggeburth marked this merge request as ready

    marked this merge request as ready

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons

    This merge request affects 28 files:

    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/CMakeLists.txt
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/CellsOfMuon.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/ClusterNearMuon.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IDTrackCaloDepositsDecoratorTool.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IIDTrackCaloDepositsDecoratorTool.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IMuonTPExtrapolationTool.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/MuonIDCovMatrixDecorator.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/MuonJetDrTool.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/MuonTPExtrapolationTool.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/MuonTPJpsiVertexFittingAlg.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/MuonTruthClassifierFallback.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/MuonTruthIsolationTool.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/VertexDecoratorAlg.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/dimuonTaggingTool.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/isolationDecorator.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/mcpDecorator.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/IDTrackCaloDepositsDecoratorTool.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonIDCovMatrixDecorator.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonJetDrTool.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPExtrapolationTool.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTruthClassifierFallback.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTruthIsolationTool.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/VertexDecoratorAlg.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/dimuonTaggingTool.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/isolationDecorator.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/mcpDecorator.cxx

    Adding @maklein ,@mvanadia ,@stavrop ,@gabarone ,@jojungge as watchers

  • ATLAS Robot added Derivation JetEtmiss master review-pending-level-1 labels

    added Derivation JetEtmiss master review-pending-level-1 labels

  • Johannes Junggeburth added 1 commit

    added 1 commit

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons

    This merge request affects 28 files:

    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/CMakeLists.txt
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/CellsOfMuon.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/ClusterNearMuon.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IDTrackCaloDepositsDecoratorTool.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IIDTrackCaloDepositsDecoratorTool.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IMuonTPExtrapolationTool.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/MuonIDCovMatrixDecorator.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/MuonJetDrTool.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/MuonTPExtrapolationTool.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/MuonTPJpsiVertexFittingAlg.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/MuonTruthClassifierFallback.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/MuonTruthIsolationTool.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/VertexDecoratorAlg.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/dimuonTaggingTool.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/isolationDecorator.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/mcpDecorator.h
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/IDTrackCaloDepositsDecoratorTool.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonIDCovMatrixDecorator.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonJetDrTool.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPExtrapolationTool.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTruthClassifierFallback.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTruthIsolationTool.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/VertexDecoratorAlg.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/dimuonTaggingTool.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/isolationDecorator.cxx
    • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/mcpDecorator.cxx

    Adding @maklein ,@mvanadia ,@stavrop ,@gabarone ,@jojungge as watchers

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :negative_squared_cross_mark: CI Result FAILURE (hash f112c04f)

    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 :o: :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
    :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
    :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 42325]

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash 9cf5841a)

    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
    :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 42326]

  • V
    Volker Andreas Austrup @vaustrup ·
    Developer

    Hi,

    changes look fine from L1 side. Approving.

    Cheers, Volker (L1)

  • Volker Andreas Austrup added review-approved label and removed review-pending-level-1 label

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

  • Walter Lampl merged

    merged

  • Walter Lampl mentioned in commit 285ce01b

    mentioned in commit 285ce01b

  • Atlas Nightlybuild added sweep:ignore label

    added sweep:ignore label

Please register or sign in to reply