Merge remote-tracking branch 'upstream/master' into scint_calo_digi (0ff48498) · Commits · Charlotte Cavanagh / calypso

Commit 0ff48498 authored 3 years ago by Claire Antel

Browse files

Merge remote-tracking branch 'upstream/master' into scint_calo_digi

parents 8882b789 4024060d

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 2 additions, 2 deletions

.gitlab-ci.yml
Calorimeter/CaloEventCnv/FaserCaloSimEventAthenaPool/src/CaloHitCollectionCnv.cxx 6 additions, 2 deletions

.../FaserCaloSimEventAthenaPool/src/CaloHitCollectionCnv.cxx
Calorimeter/CaloEventCnv/FaserCaloSimEventAthenaPool/src/CaloHitCollectionCnv.h 4 additions, 2 deletions

...nv/FaserCaloSimEventAthenaPool/src/CaloHitCollectionCnv.h
Calorimeter/CaloEventCnv/FaserCaloSimEventTPCnv/CMakeLists.txt 1 addition, 1 deletion

...imeter/CaloEventCnv/FaserCaloSimEventTPCnv/CMakeLists.txt
Calorimeter/CaloEventCnv/FaserCaloSimEventTPCnv/FaserCaloSimEventTPCnv/CaloHits/CaloHitCollectionCnv_p1a.h 41 additions, 0 deletions

...aserCaloSimEventTPCnv/CaloHits/CaloHitCollectionCnv_p1a.h
Calorimeter/CaloEventCnv/FaserCaloSimEventTPCnv/FaserCaloSimEventTPCnv/CaloHits/CaloHitCollection_p1a.h 59 additions, 0 deletions

...v/FaserCaloSimEventTPCnv/CaloHits/CaloHitCollection_p1a.h
Calorimeter/CaloEventCnv/FaserCaloSimEventTPCnv/FaserCaloSimEventTPCnv/CaloSimEventTPCnvDict.h 2 additions, 0 deletions

...EventTPCnv/FaserCaloSimEventTPCnv/CaloSimEventTPCnvDict.h
Calorimeter/CaloEventCnv/FaserCaloSimEventTPCnv/FaserCaloSimEventTPCnv/selection.xml 2 additions, 0 deletions

...serCaloSimEventTPCnv/FaserCaloSimEventTPCnv/selection.xml
Calorimeter/CaloEventCnv/FaserCaloSimEventTPCnv/src/CaloHits/CaloHitCollectionCnv_p1.cxx 44 additions, 7 deletions

...aloSimEventTPCnv/src/CaloHits/CaloHitCollectionCnv_p1.cxx
Calorimeter/CaloEventCnv/FaserCaloSimEventTPCnv/src/CaloHits/CaloHitCollectionCnv_p1a.cxx 339 additions, 0 deletions

...loSimEventTPCnv/src/CaloHits/CaloHitCollectionCnv_p1a.cxx
Calorimeter/CaloG4/EcalG4_SD/python/EcalG4_SDToolConfig.py 4 additions, 2 deletions

Calorimeter/CaloG4/EcalG4_SD/python/EcalG4_SDToolConfig.py
Calorimeter/CaloRecAlgs/CMakeLists.txt 15 additions, 0 deletions

Calorimeter/CaloRecAlgs/CMakeLists.txt
Calorimeter/CaloRecAlgs/python/CaloRecAlgsConfig.py 41 additions, 0 deletions

Calorimeter/CaloRecAlgs/python/CaloRecAlgsConfig.py
Calorimeter/CaloRecAlgs/src/CaloRecAlg.cxx 123 additions, 0 deletions

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

Calorimeter/CaloRecAlgs/src/CaloRecAlg.h
Calorimeter/CaloRecAlgs/src/components/CaloRecAlgs_entries.cxx 3 additions, 0 deletions

...imeter/CaloRecAlgs/src/components/CaloRecAlgs_entries.cxx
Control/CalypsoConfiguration/python/GeoModelConfigFlags.py 2 additions, 0 deletions

Control/CalypsoConfiguration/python/GeoModelConfigFlags.py
Control/CalypsoExample/GeoModelTest/CMakeLists.txt 8 additions, 2 deletions

Control/CalypsoExample/GeoModelTest/CMakeLists.txt
Control/CalypsoExample/GeoModelTest/python/Faser01TestConfig.py 4 additions, 2 deletions

...l/CalypsoExample/GeoModelTest/python/Faser01TestConfig.py
Control/CalypsoExample/GeoModelTest/python/Faser02TestConfig.py 66 additions, 0 deletions

...l/CalypsoExample/GeoModelTest/python/Faser02TestConfig.py

with 849 additions and 20 deletions

Please register or to comment