Skip to content
Snippets Groups Projects

CalibrationDataInterface+BTaggingEfficiencyTool: remove mutables and const fixes

Merged Frank Winklmeier requested to merge fwinkl/athena:calibinterface into master

Most of the classes use internal caching by modifying mutables in const functions. Remove the mutables in favor of making the interfaces non-const to make it clear that these methods are not thread-safe.

Enable thread-checker.

Edited by Frank Winklmeier

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
  • Except for the tiny comment looks good to me.

  • Frank Winklmeier added 128 commits

    added 128 commits

    • 569aabad...28da07a9 - 125 commits from branch atlas:master
    • 30e22f8a - CalibrationDataInterface: remove mutables and const fixes
    • 834d912a - BTaggingEfficiencyTool: make interfaces non-const
    • 864cdc88 - SUSYTools: make BtagSF[_trkJet] non-const

    Compare with previous version

  • Frank Winklmeier resolved all threads

    resolved all threads

  • This merge request affects 4 packages:

    • PhysicsAnalysis/Interfaces/FTagAnalysisInterfaces
    • PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface
    • PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency
    • PhysicsAnalysis/SUSYPhys/SUSYTools

    Affected files list will not be printed in this case

    Adding @zmarshal ,@duperrin ,@cmerlass ,@cohm ,@salderwe ,@szambito ,@mrimoldi ,@akraszna ,@janders ,@dguest ,@bdong ,@lidiaz as watchers

  • :warning: WARNING: big files (>100K) are found in the changeset

    :pencil: 128K in file PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/Root/CalibrationDataInterfaceROOT.cxx

  • :pencil: Build area was cleaned as per request posted in the DB. The full software build will be performed

  • :pencil: There were multiple CI triggers for this MR and commit. The system ignored duplicates but the GitLab pipeline status may incorrectly show the job as failed. Once the remaining job finished running, the CI results will be posted as usual.

  • :x: CI Result FAILURE (hash 864cdc88)

    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:
    tests :o: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :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 61256]

  • Author Maintainer

    Jenkins please retry a build

  • This merge request affects 4 packages:

    • PhysicsAnalysis/Interfaces/FTagAnalysisInterfaces
    • PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface
    • PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency
    • PhysicsAnalysis/SUSYPhys/SUSYTools

    Affected files list will not be printed in this case

    Adding @zmarshal ,@duperrin ,@cmerlass ,@cohm ,@salderwe ,@szambito ,@mrimoldi ,@akraszna ,@janders ,@dguest ,@bdong ,@lidiaz as watchers

  • :warning: WARNING: big files (>100K) are found in the changeset

    :pencil: 128K in file PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/Root/CalibrationDataInterfaceROOT.cxx

  • :white_check_mark: CI Result SUCCESS (hash 864cdc88)

    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:
    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. Check the JIRA CI status board for known problems
    :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 61305]

  • Looks good. Approved

    Sergei L1

  • merged

  • Walter Lampl mentioned in commit 5dafdbd9

    mentioned in commit 5dafdbd9

  • Atlas Nightlybuild picked the changes into the branch cherry-pick-5dafdbd9cf8-22.0 with commit a8187fbb

    picked the changes into the branch cherry-pick-5dafdbd9cf8-22.0 with commit a8187fbb

  • Walter Lampl mentioned in commit a8187fbb

    mentioned in commit a8187fbb

  • Atlas Nightlybuild mentioned in merge request !58093 (merged)

    mentioned in merge request !58093 (merged)

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