Merge branch 'alma9-dev' into 'master'
alma9-dev merge See merge request faser/calypso!418
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 10 additions, 15 deletions.gitlab-ci.yml
- CMakeLists.txt 1 addition, 0 deletionsCMakeLists.txt
- Calorimeter/CaloDetDescr/CaloGeoModelUtils/CaloGeoModelUtils/CaloDDAthenaComps.h 2 additions, 11 deletions...r/CaloGeoModelUtils/CaloGeoModelUtils/CaloDDAthenaComps.h
- Calorimeter/CaloDetDescr/CaloGeoModelUtils/CaloGeoModelUtils/CaloMaterialManager.h 4 additions, 14 deletions...CaloGeoModelUtils/CaloGeoModelUtils/CaloMaterialManager.h
- Calorimeter/CaloDetDescr/CaloGeoModelUtils/CaloGeoModelUtils/DetectorFactoryBase.h 2 additions, 3 deletions...CaloGeoModelUtils/CaloGeoModelUtils/DetectorFactoryBase.h
- Calorimeter/CaloDetDescr/CaloGeoModelUtils/src/CaloDDAthenaComps.cxx 1 addition, 1 deletion.../CaloDetDescr/CaloGeoModelUtils/src/CaloDDAthenaComps.cxx
- Calorimeter/CaloDetDescr/CaloGeoModelUtils/src/CaloMaterialManager.cxx 99 additions, 120 deletions...aloDetDescr/CaloGeoModelUtils/src/CaloMaterialManager.cxx
- Calorimeter/CaloDetDescr/CaloGeoModelUtils/src/DistortedMaterialManager.cxx 2 additions, 2 deletions...tDescr/CaloGeoModelUtils/src/DistortedMaterialManager.cxx
- Calorimeter/CaloDetDescr/CaloReadoutGeometry/CaloReadoutGeometry/CaloCommonItems.h 4 additions, 16 deletions...CaloReadoutGeometry/CaloReadoutGeometry/CaloCommonItems.h
- Calorimeter/CaloDetDescr/CaloReadoutGeometry/CaloReadoutGeometry/CaloDetectorManagerBase.h 2 additions, 13 deletions...outGeometry/CaloReadoutGeometry/CaloDetectorManagerBase.h
- Calorimeter/CaloDetDescr/CaloReadoutGeometry/src/CaloCommonItems.cxx 1 addition, 1 deletion.../CaloDetDescr/CaloReadoutGeometry/src/CaloCommonItems.cxx
- Calorimeter/CaloDetDescr/CaloReadoutGeometry/src/CaloDetectorManagerBase.cxx 3 additions, 2 deletions...Descr/CaloReadoutGeometry/src/CaloDetectorManagerBase.cxx
- Calorimeter/CaloDetDescr/EcalGeoModel/CMakeLists.txt 2 additions, 1 deletionCalorimeter/CaloDetDescr/EcalGeoModel/CMakeLists.txt
- Calorimeter/CaloDetDescr/EcalGeoModel/src/EcalModule.cxx 1 addition, 1 deletionCalorimeter/CaloDetDescr/EcalGeoModel/src/EcalModule.cxx
- Calorimeter/CaloDetDescr/EcalGeoModel/test/EcalGMConfig_test.py 8 additions, 7 deletions...meter/CaloDetDescr/EcalGeoModel/test/EcalGMConfig_test.py
- Calorimeter/CaloDetDescrCnv/CaloIdCnv/src/EcalIDDetDescrCnv.cxx 2 additions, 2 deletions...meter/CaloDetDescrCnv/CaloIdCnv/src/EcalIDDetDescrCnv.cxx
- Calorimeter/CaloEventCnv/FaserCaloSimEventAthenaPool/CMakeLists.txt 8 additions, 12 deletions...r/CaloEventCnv/FaserCaloSimEventAthenaPool/CMakeLists.txt
- Calorimeter/CaloEventCnv/FaserCaloSimEventTPCnv/CMakeLists.txt 4 additions, 7 deletions...imeter/CaloEventCnv/FaserCaloSimEventTPCnv/CMakeLists.txt
- Calorimeter/CaloEventCnv/FaserCaloSimEventTPCnv/src/CaloHits/CaloHitCollectionCnv_p1.cxx 1 addition, 1 deletion...aloSimEventTPCnv/src/CaloHits/CaloHitCollectionCnv_p1.cxx
- Calorimeter/CaloEventCnv/FaserCaloSimEventTPCnv/src/CaloHits/CaloHitCollectionCnv_p1a.cxx 1 addition, 1 deletion...loSimEventTPCnv/src/CaloHits/CaloHitCollectionCnv_p1a.cxx
Loading
Please register or sign in to comment