Skip to content
Snippets Groups Projects

PanTau code cleanup

Merged PanTau code cleanup
martindl/athena:R22_PanTauCleanup into master
Merged Bertrand Martin Dit Latour requested to merge martindl/athena:R22_PanTauCleanup into master

Hello,

This MR is a second pass of code cleaning, to make it more readable, before we can attempt anything. Nothing but renaming, code indentation, dropping commented out/unused stuff. It does not change the reconstruction output.

Cheers, Bertrand

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
  • Bertrand Martin Dit Latour added Reconstruction Tau master labels

    added Reconstruction Tau master labels

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Reconstruction/PanTau/PanTauAlgs

    This merge request affects 30 files:

    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/HelperFunctions.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/ITool_DetailsArranger.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/ITool_InputConverter.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/ITool_ModeDiscriminator.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/ITool_PanTauTools.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/ITool_TauConstituentGetter.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/ITool_TauConstituentSelector.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/PanTauSeed.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/TauConstituent.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/TauFeature.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/Tool_DecayModeDeterminator.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/Tool_DetailsArranger.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/Tool_FeatureExtractor.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/Tool_InputConverter.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/Tool_ModeDiscriminator.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/Tool_TauConstituentGetter.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/Tool_TauConstituentSelector.h
    • Reconstruction/PanTau/PanTauAlgs/Root/HelperFunctions.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/PanTauProcessor.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/PanTauSeed.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/TauConstituent.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/TauFeature.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/Tool_DecayModeDeterminator.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/Tool_DetailsArranger.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/Tool_FeatureExtractor.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/Tool_InformationStore.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/Tool_InputConverter.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/Tool_ModeDiscriminator.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/Tool_TauConstituentGetter.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/Tool_TauConstituentSelector.cxx

    Adding @goetz ,@xiaozhon ,@adbailey as watchers

  • ATLAS Robot added review-pending-level-1 label

    added review-pending-level-1 label

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :negative_squared_cross_mark: CI Result FAILURE (hash 39f7fd3d)

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

  • Bertrand Martin Dit Latour added 1 commit

    added 1 commit

    • 80f18dfa - missing include for AnalysisBase

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Reconstruction/PanTau/PanTauAlgs

    This merge request affects 30 files:

    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/HelperFunctions.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/ITool_DetailsArranger.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/ITool_InputConverter.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/ITool_ModeDiscriminator.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/ITool_PanTauTools.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/ITool_TauConstituentGetter.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/ITool_TauConstituentSelector.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/PanTauSeed.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/TauConstituent.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/TauFeature.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/Tool_DecayModeDeterminator.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/Tool_DetailsArranger.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/Tool_FeatureExtractor.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/Tool_InputConverter.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/Tool_ModeDiscriminator.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/Tool_TauConstituentGetter.h
    • Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/Tool_TauConstituentSelector.h
    • Reconstruction/PanTau/PanTauAlgs/Root/HelperFunctions.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/PanTauProcessor.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/PanTauSeed.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/TauConstituent.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/TauFeature.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/Tool_DecayModeDeterminator.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/Tool_DetailsArranger.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/Tool_FeatureExtractor.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/Tool_InformationStore.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/Tool_InputConverter.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/Tool_ModeDiscriminator.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/Tool_TauConstituentGetter.cxx
    • Reconstruction/PanTau/PanTauAlgs/Root/Tool_TauConstituentSelector.cxx

    Adding @goetz ,@xiaozhon ,@adbailey as watchers

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash 80f18dfa)

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

  • Frank Winklmeier
    Frank Winklmeier @fwinkl ·
    Maintainer

    For this or a future MR, you may want to also enable flake8:

    atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
  • Bertrand Martin Dit Latour added 1 commit

    added 1 commit

    • 695b11b5 - Enable flake8. Minimal cleanup of JobOptions_Main_PanTau to silence the...

    Compare with previous version

  • Bertrand Martin Dit Latour
    Bertrand Martin Dit Latour @martindl ·
    Author Developer

    Thanks @fwinkl , done.

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Reconstruction/PanTau/PanTauAlgs

    This merge request affects 32 files. Since this is a long list, it will not be printed.

    Adding @goetz ,@xiaozhon ,@adbailey as watchers

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash 695b11b5)

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

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

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

  • Frank Winklmeier merged

    merged

  • Frank Winklmeier mentioned in commit 15eb65e7

    mentioned in commit 15eb65e7

  • Atlas Nightlybuild added sweep:ignore label

    added sweep:ignore label

Please register or sign in to reply