Merge branch 'master' into torrence-datarec (29d9d87d) · Commits · Charlotte Cavanagh / calypso

Commit 29d9d87d authored 2 years ago by Eric Torrence

Browse files

Merge branch 'master' into torrence-datarec

parents 38fc8912 59bf787b

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

Calorimeter/CaloRecAlgs/CMakeLists.txt 1 addition, 1 deletion

Calorimeter/CaloRecAlgs/CMakeLists.txt
Calorimeter/CaloRecAlgs/python/CaloRecAlgsConfig.py 9 additions, 8 deletions

Calorimeter/CaloRecAlgs/python/CaloRecAlgsConfig.py
Calorimeter/CaloRecAlgs/src/CaloRecAlg.cxx 107 additions, 54 deletions

Calorimeter/CaloRecAlgs/src/CaloRecAlg.cxx
Calorimeter/CaloRecAlgs/src/CaloRecAlg.h 23 additions, 11 deletions

Calorimeter/CaloRecAlgs/src/CaloRecAlg.h
Calorimeter/CaloRecTools/CMakeLists.txt 30 additions, 0 deletions

Calorimeter/CaloRecTools/CMakeLists.txt
Calorimeter/CaloRecTools/CaloRecTools/ICaloRecTool.h 45 additions, 0 deletions

Calorimeter/CaloRecTools/CaloRecTools/ICaloRecTool.h
Calorimeter/CaloRecTools/python/CaloRecToolConfig.py 28 additions, 0 deletions

Calorimeter/CaloRecTools/python/CaloRecToolConfig.py
Calorimeter/CaloRecTools/src/CaloRecTool.cxx 195 additions, 0 deletions

Calorimeter/CaloRecTools/src/CaloRecTool.cxx
Calorimeter/CaloRecTools/src/CaloRecTool.h 86 additions, 0 deletions

Calorimeter/CaloRecTools/src/CaloRecTool.h
Calorimeter/CaloRecTools/src/components/CaloRecTools_entries.cxx 3 additions, 0 deletions

...eter/CaloRecTools/src/components/CaloRecTools_entries.cxx
Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py 1 addition, 1 deletion

Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py
Control/CalypsoExample/Digitization/scripts/faserMDC_digi_merge.py 1 addition, 1 deletion

...alypsoExample/Digitization/scripts/faserMDC_digi_merge.py
Control/CalypsoExample/Digitization/scripts/faser_digi.py 1 addition, 1 deletion

Control/CalypsoExample/Digitization/scripts/faser_digi.py
Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py 1 addition, 1 deletion

...l/CalypsoExample/Digitization/scripts/faser_digi_merge.py
Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_muon_fasernu_1000GeV-101312.json 14 additions, 0 deletions

.../data/mdc/FaserMC-MDC_PG_muon_fasernu_1000GeV-101312.json
Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_muon_fasernu_100GeV-101310.json 14 additions, 0 deletions

...n/data/mdc/FaserMC-MDC_PG_muon_fasernu_100GeV-101310.json
Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_muon_fasernu_10GeV-101308.json 14 additions, 0 deletions

...on/data/mdc/FaserMC-MDC_PG_muon_fasernu_10GeV-101308.json
Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_muon_fasernu_300GeV-101311.json 14 additions, 0 deletions

...n/data/mdc/FaserMC-MDC_PG_muon_fasernu_300GeV-101311.json
Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_muon_fasernu_30GeV-101309.json 14 additions, 0 deletions

...on/data/mdc/FaserMC-MDC_PG_muon_fasernu_30GeV-101309.json
Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_muon_fasernu_logE-101307.json 1 addition, 1 deletion

...ion/data/mdc/FaserMC-MDC_PG_muon_fasernu_logE-101307.json

with 602 additions and 79 deletions

Please register or to comment