Merge branch 'master' into '22.0-zdc-stage1' (b1bb2d2b) · Commits · atlas / athena

Commit b1bb2d2b authored 3 years ago by Peter Alan Steinberg

Merge branch 'master' into '22.0-zdc-stage1'

# Conflicts:
#   ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCDataAnalyzer.cxx
#   ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCFitWrapper.cxx
#   ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCPulseAnalyzer.cxx
#   ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx
#   ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcSincInterp.cxx
#   ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCDataAnalyzer.h
#   ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCFitWrapper.h
#   ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCPulseAnalyzer.h
#   ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZdcAnalysisTool.h
#   ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZdcSincInterp.h

parents 4f81f005 e18921b6

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 57 additions and 1145 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment