Merge branch 'Calibration' into 'master' (541a9354) · Commits · Charlotte Cavanagh / calypso · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

calypso
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

541a9354

Commit 541a9354 authored 2 years ago by Eric Torrence

Downloads
- Plain Diff

Merge branch 'Calibration' into 'master'

Update Calo Energy Calibration

See merge request faser/calypso!294

parents d3e5de75 30001d31

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

Calorimeter/CaloRecAlgs/src/CaloRecAlg.cxx 37 additions, 34 deletions

Calorimeter/CaloRecAlgs/src/CaloRecAlg.cxx
Calorimeter/CaloRecAlgs/src/CaloRecAlg.h 7 additions, 0 deletions

Calorimeter/CaloRecAlgs/src/CaloRecAlg.h
Calorimeter/CaloRecTools/python/CaloRecToolConfig.py 1 addition, 2 deletions

Calorimeter/CaloRecTools/python/CaloRecToolConfig.py
Calorimeter/CaloRecTools/src/CaloRecTool.cxx 5 additions, 6 deletions

Calorimeter/CaloRecTools/src/CaloRecTool.cxx
Calorimeter/CaloRecTools/src/CaloRecTool.h 1 addition, 2 deletions

Calorimeter/CaloRecTools/src/CaloRecTool.h
xAOD/xAODFaserCalorimeter/Root/CalorimeterHitAuxContainer_v1.cxx 4 additions, 2 deletions

...ODFaserCalorimeter/Root/CalorimeterHitAuxContainer_v1.cxx
xAOD/xAODFaserCalorimeter/Root/CalorimeterHit_v1.cxx 7 additions, 3 deletions

xAOD/xAODFaserCalorimeter/Root/CalorimeterHit_v1.cxx
xAOD/xAODFaserCalorimeter/xAODFaserCalorimeter/versions/CalorimeterHitAuxContainer_v1.h 4 additions, 2 deletions

...FaserCalorimeter/versions/CalorimeterHitAuxContainer_v1.h
xAOD/xAODFaserCalorimeter/xAODFaserCalorimeter/versions/CalorimeterHit_v1.h 10 additions, 4 deletions

...rimeter/xAODFaserCalorimeter/versions/CalorimeterHit_v1.h

with 76 additions and 55 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment