Merge branch 'jct-220206' into 'master' (59144c3e) · Commits · Xinhui Huang / athena

Commit 59144c3e authored 3 years ago by Frank Winklmeier

Merge branch 'jct-220206' into 'master'

JetCalibTools structural re-work (retry)

See merge request atlas/athena!50264

parents 5654d56c 91875f68

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx 2 additions, 2 deletions

...nalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
Reconstruction/Jet/JetCalibTools/JetCalibTools/CalibrationMethods/BcidOffsetCorrection.h 9 additions, 24 deletions

...s/JetCalibTools/CalibrationMethods/BcidOffsetCorrection.h
Reconstruction/Jet/JetCalibTools/JetCalibTools/CalibrationMethods/EtaJESCorrection.h 6 additions, 12 deletions

...Tools/JetCalibTools/CalibrationMethods/EtaJESCorrection.h
Reconstruction/Jet/JetCalibTools/JetCalibTools/CalibrationMethods/GlobalSequentialCorrection.h 4 additions, 9 deletions

...alibTools/CalibrationMethods/GlobalSequentialCorrection.h
Reconstruction/Jet/JetCalibTools/JetCalibTools/CalibrationMethods/InsituDataCorrection.h 10 additions, 10 deletions

...s/JetCalibTools/CalibrationMethods/InsituDataCorrection.h
Reconstruction/Jet/JetCalibTools/JetCalibTools/CalibrationMethods/JMSCorrection.h 5 additions, 9 deletions

...libTools/JetCalibTools/CalibrationMethods/JMSCorrection.h
Reconstruction/Jet/JetCalibTools/JetCalibTools/CalibrationMethods/JetPileupCorrection.h 5 additions, 11 deletions

...ls/JetCalibTools/CalibrationMethods/JetPileupCorrection.h
Reconstruction/Jet/JetCalibTools/JetCalibTools/CalibrationMethods/JetSmearingCorrection.h 11 additions, 12 deletions

.../JetCalibTools/CalibrationMethods/JetSmearingCorrection.h
Reconstruction/Jet/JetCalibTools/JetCalibTools/CalibrationMethods/ResidualOffsetCorrection.h 6 additions, 10 deletions

...tCalibTools/CalibrationMethods/ResidualOffsetCorrection.h
Reconstruction/Jet/JetCalibTools/JetCalibTools/IJetCalibrationTool.h 0 additions, 7 deletions

...ion/Jet/JetCalibTools/JetCalibTools/IJetCalibrationTool.h
Reconstruction/Jet/JetCalibTools/JetCalibTools/JetCalibrationStep.h 46 additions, 0 deletions

...tion/Jet/JetCalibTools/JetCalibTools/JetCalibrationStep.h
Reconstruction/Jet/JetCalibTools/JetCalibTools/JetCalibrationTool.h 22 additions, 71 deletions

...tion/Jet/JetCalibTools/JetCalibTools/JetCalibrationTool.h
Reconstruction/Jet/JetCalibTools/JetCalibTools/JetCalibrationToolBase.h 0 additions, 99 deletions

.../Jet/JetCalibTools/JetCalibTools/JetCalibrationToolBase.h
Reconstruction/Jet/JetCalibTools/Root/BcidOffsetCorrection.cxx 23 additions, 21 deletions

...struction/Jet/JetCalibTools/Root/BcidOffsetCorrection.cxx
Reconstruction/Jet/JetCalibTools/Root/EtaJESCorrection.cxx 13 additions, 15 deletions

Reconstruction/Jet/JetCalibTools/Root/EtaJESCorrection.cxx
Reconstruction/Jet/JetCalibTools/Root/GlobalSequentialCorrection.cxx 10 additions, 14 deletions

...ion/Jet/JetCalibTools/Root/GlobalSequentialCorrection.cxx
Reconstruction/Jet/JetCalibTools/Root/InsituDataCorrection.cxx 24 additions, 18 deletions

...struction/Jet/JetCalibTools/Root/InsituDataCorrection.cxx
Reconstruction/Jet/JetCalibTools/Root/JMSCorrection.cxx 7 additions, 10 deletions

Reconstruction/Jet/JetCalibTools/Root/JMSCorrection.cxx
Reconstruction/Jet/JetCalibTools/Root/JetCalibUtils.cxx 1 addition, 2 deletions

Reconstruction/Jet/JetCalibTools/Root/JetCalibUtils.cxx
Reconstruction/Jet/JetCalibTools/Root/JetCalibrationStep.cxx 41 additions, 0 deletions

Reconstruction/Jet/JetCalibTools/Root/JetCalibrationStep.cxx

with 245 additions and 356 deletions

Please register or to comment