Merge branch 'master-scint' into 'master' (0f79a1fb) · Commits · Charlotte Cavanagh / calypso

Commit 0f79a1fb authored 5 years ago by Dave Casper

Merge branch 'master-scint' into 'master'

Add trigger and preshower scintillators to geometry

See merge request faser/calypso!45

parents 4795d24e c0567b59

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

Control/CalypsoExample/GeoModelTest/python/GeoModelTestConfig.py 2 additions, 0 deletions

.../CalypsoExample/GeoModelTest/python/GeoModelTestConfig.py
Control/CalypsoExample/GeoModelTest/src/GeoModelTestAlg.cxx 315 additions, 0 deletions

Control/CalypsoExample/GeoModelTest/src/GeoModelTestAlg.cxx
Control/CalypsoExample/GeoModelTest/src/GeoModelTestAlg.h 10 additions, 0 deletions

Control/CalypsoExample/GeoModelTest/src/GeoModelTestAlg.h
DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx 4 additions, 0 deletions

DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx
DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql 211 additions, 1 deletion

DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql
DetectorDescription/GeoModel/FaserGeoModel/python/FaserGeoModelConfig.py 0 additions, 3 deletions

...tion/GeoModel/FaserGeoModel/python/FaserGeoModelConfig.py
DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelInit.py 18 additions, 0 deletions

...Description/GeoModel/FaserGeoModel/python/GeoModelInit.py
DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py 10 additions, 0 deletions

...escription/GeoModel/FaserGeoModel/python/ScintGMConfig.py
DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoScintHit.icc 23 additions, 23 deletions

...cription/GeoModel/GeoAdaptors/GeoAdaptors/GeoScintHit.icc
Scintillator/ScintDetDescr/PreshowerGeoModel/CMakeLists.txt 49 additions, 0 deletions

Scintillator/ScintDetDescr/PreshowerGeoModel/CMakeLists.txt
Scintillator/ScintDetDescr/PreshowerGeoModel/PreshowerGeoModel/PreshowerDetectorTool.h 61 additions, 0 deletions

...eshowerGeoModel/PreshowerGeoModel/PreshowerDetectorTool.h
Scintillator/ScintDetDescr/PreshowerGeoModel/PreshowerGeoModel/PreshowerGeoModelAthenaComps.h 29 additions, 0 deletions

...GeoModel/PreshowerGeoModel/PreshowerGeoModelAthenaComps.h
Scintillator/ScintDetDescr/PreshowerGeoModel/python/PreshowerGeoModelConfig.py 55 additions, 0 deletions

...Descr/PreshowerGeoModel/python/PreshowerGeoModelConfig.py
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerComponentFactory.cxx 40 additions, 0 deletions

...Descr/PreshowerGeoModel/src/PreshowerComponentFactory.cxx
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerComponentFactory.h 89 additions, 0 deletions

...etDescr/PreshowerGeoModel/src/PreshowerComponentFactory.h
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerDataBase.cxx 104 additions, 0 deletions

...ScintDetDescr/PreshowerGeoModel/src/PreshowerDataBase.cxx
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerDataBase.h 59 additions, 0 deletions

...r/ScintDetDescr/PreshowerGeoModel/src/PreshowerDataBase.h
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerDetectorFactory.cxx 263 additions, 0 deletions

...tDescr/PreshowerGeoModel/src/PreshowerDetectorFactory.cxx
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerDetectorFactory.h 50 additions, 0 deletions

...DetDescr/PreshowerGeoModel/src/PreshowerDetectorFactory.h
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerDetectorTool.cxx 249 additions, 0 deletions

...tDetDescr/PreshowerGeoModel/src/PreshowerDetectorTool.cxx

with 1641 additions and 27 deletions

Please register or to comment