Skip to content
Snippets Groups Projects

Add final/override where possible/applicable

Merged Christos Anastopoulos requested to merge ATLAS-EGamma/athena:Add_final into master

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
  • This merge request affects 18 files:

    • Tracking/TrkDetDescr/TrkAlignableSurfaces/TrkAlignableSurfaces/AlignablePlaneSurface.h
    • Tracking/TrkDetDescr/TrkDetDescrUtils/TrkDetDescrUtils/CompactBinnedArray1D.h
    • Tracking/TrkDetDescr/TrkDetDescrUtils/TrkDetDescrUtils/CompactBinnedArray2D.h
    • Tracking/TrkDetDescr/TrkGeometrySurfaces/TrkGeometrySurfaces/SlidingCylinderSurface.h
    • Tracking/TrkDetDescr/TrkGeometrySurfaces/TrkGeometrySurfaces/SlidingDiscSurface.h
    • Tracking/TrkDetDescr/TrkGeometrySurfaces/src/SlidingCylinderSurface.cxx
    • Tracking/TrkDetDescr/TrkGeometrySurfaces/src/SlidingDiscSurface.cxx
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/ConeBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/CylinderBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DiamondBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DiscBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/EllipseBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PerigeeSurface.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/StraightLineSurface.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/TrapezoidBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/TriangleBounds.h
    • Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h
    • Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.h

    Adding @amorley as watcher

  • :negative_squared_cross_mark: CI Result FAILURE (hash ba7d42b8)

    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 :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
    :o: Athena: number of compilation errors 1, warnings 3
    :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 23325]

  • added 1 commit

    • de2ab24a - Add final/override where possible/applicable

    Compare with previous version

  • This merge request affects 17 files:

    • Tracking/TrkDetDescr/TrkAlignableSurfaces/TrkAlignableSurfaces/AlignablePlaneSurface.h
    • Tracking/TrkDetDescr/TrkDetDescrUtils/TrkDetDescrUtils/CompactBinnedArray1D.h
    • Tracking/TrkDetDescr/TrkDetDescrUtils/TrkDetDescrUtils/CompactBinnedArray2D.h
    • Tracking/TrkDetDescr/TrkGeometrySurfaces/TrkGeometrySurfaces/SlidingCylinderSurface.h
    • Tracking/TrkDetDescr/TrkGeometrySurfaces/TrkGeometrySurfaces/SlidingDiscSurface.h
    • Tracking/TrkDetDescr/TrkGeometrySurfaces/src/SlidingCylinderSurface.cxx
    • Tracking/TrkDetDescr/TrkGeometrySurfaces/src/SlidingDiscSurface.cxx
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/ConeBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/CylinderBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DiamondBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DiscBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/EllipseBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/StraightLineSurface.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/TrapezoidBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/TriangleBounds.h
    • Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h
    • Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.h

    Adding @amorley as watcher

  • :negative_squared_cross_mark: CI Result FAILURE (hash de2ab24a)

    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 :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
    :o: Athena: number of compilation errors 1, warnings 3
    :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 23330]

  • Please fix the compilation errors

  • Hi you do not need full build ...

    @ssnyder do you recall why we have "mungeZeroQOverP" , from the comments I understand is a bug preserving thingy ?

  • added 1 commit

    • cad4e0a0 - Can not have ParametersT due to mungeZeroQOverP

    Compare with previous version

  • This merge request affects 17 files:

    • Tracking/TrkDetDescr/TrkAlignableSurfaces/TrkAlignableSurfaces/AlignablePlaneSurface.h
    • Tracking/TrkDetDescr/TrkDetDescrUtils/TrkDetDescrUtils/CompactBinnedArray1D.h
    • Tracking/TrkDetDescr/TrkDetDescrUtils/TrkDetDescrUtils/CompactBinnedArray2D.h
    • Tracking/TrkDetDescr/TrkGeometrySurfaces/TrkGeometrySurfaces/SlidingCylinderSurface.h
    • Tracking/TrkDetDescr/TrkGeometrySurfaces/TrkGeometrySurfaces/SlidingDiscSurface.h
    • Tracking/TrkDetDescr/TrkGeometrySurfaces/src/SlidingCylinderSurface.cxx
    • Tracking/TrkDetDescr/TrkGeometrySurfaces/src/SlidingDiscSurface.cxx
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/ConeBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/CylinderBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DiamondBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DiscBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/EllipseBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PerigeeSurface.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/StraightLineSurface.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/TrapezoidBounds.h
    • Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/TriangleBounds.h
    • Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h

    Adding @amorley as watcher

  • hi -

    I think it was something like this.

    Originally, the converters would directly set private members of transient objects directly. We had some events saved in which qOverP was exactly 0. These converters preserved this in the transient representation.

    When i got rid of the #define private's, these converters changed to initialize the transient object via the Trk::Perigee constructor. However, if you give this a parameter set with qOverP==0, it changes it to InvalidParam::INVALID_QOP (1e-9) in the transient representation. The function referred to here was a hack to recover the original behavior, where the transient qOverP would remain exactly 0.

    At the time, keeping the exact behavior of the existing converters was important in ensuring that the (somewhat extensive) changes needed to remove #define private weren't screwing things up.

    Perhaps getting exactly the same result when reading old reconstructed data is not so important now and this can be removed. (But that would likely require updating some of the *AthenaPool tests.)

  • yea OK, will take a look it is not biggy for this one, but took me by suprise that we inherit at the TPCnv and I could not get exactly what we try to do ...

    Edited by Christos Anastopoulos
  • :white_check_mark: CI Result SUCCESS (hash cad4e0a0)

    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 23365]

    • Mark classes as "final" (and methods)
    • Would be curious to know if this has any effect on profiling

    Approve.

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

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