Merge branch 'master-veto-factory' into 'master' (aae9ad1a) · Commits · Markus Tobias Prim / calypso

Commit aae9ad1a authored 5 years ago by Dave Casper

Merge branch 'master-veto-factory' into 'master'

GeoModel with two veto station volumes

See merge request faser/calypso!21

parents 56c56f58 990aebf7

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql 50 additions, 55 deletions

DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql
DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt 3 additions, 1 deletion

DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt
DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx 14 additions, 1 deletion

DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx
Scintillator/ScintDetDescr/ScintGeoModelUtils/ScintGeoModelUtils/DetectorFactoryBase.h 51 additions, 0 deletions

...intGeoModelUtils/ScintGeoModelUtils/DetectorFactoryBase.h
Scintillator/ScintDetDescr/ScintGeoModelUtils/ScintGeoModelUtils/DistortedMaterialManager.h 28 additions, 0 deletions

...oModelUtils/ScintGeoModelUtils/DistortedMaterialManager.h
Scintillator/ScintDetDescr/ScintGeoModelUtils/ScintGeoModelUtils/ExtraMaterial.h 37 additions, 0 deletions

...scr/ScintGeoModelUtils/ScintGeoModelUtils/ExtraMaterial.h
Scintillator/ScintDetDescr/ScintGeoModelUtils/ScintGeoModelUtils/GenericTubeMaker.h 55 additions, 0 deletions

.../ScintGeoModelUtils/ScintGeoModelUtils/GenericTubeMaker.h
Scintillator/ScintDetDescr/ScintGeoModelUtils/ScintGeoModelUtils/ScintMaterialManager.h 244 additions, 0 deletions

...ntGeoModelUtils/ScintGeoModelUtils/ScintMaterialManager.h
Scintillator/ScintDetDescr/ScintGeoModelUtils/ScintGeoModelUtils/TopLevelPlacements.h 47 additions, 0 deletions

...cintGeoModelUtils/ScintGeoModelUtils/TopLevelPlacements.h
Scintillator/ScintDetDescr/ScintGeoModelUtils/ScintGeoModelUtils/TubeVolData.h 59 additions, 0 deletions

...Descr/ScintGeoModelUtils/ScintGeoModelUtils/TubeVolData.h
Scintillator/ScintDetDescr/ScintGeoModelUtils/src/DistortedMaterialManager.cxx 46 additions, 0 deletions

...Descr/ScintGeoModelUtils/src/DistortedMaterialManager.cxx
Scintillator/ScintDetDescr/ScintGeoModelUtils/src/ExtraMaterial.cxx 75 additions, 0 deletions

...or/ScintDetDescr/ScintGeoModelUtils/src/ExtraMaterial.cxx
Scintillator/ScintDetDescr/ScintGeoModelUtils/src/GenericTubeMaker.cxx 164 additions, 0 deletions

...ScintDetDescr/ScintGeoModelUtils/src/GenericTubeMaker.cxx
Scintillator/ScintDetDescr/ScintGeoModelUtils/src/ScintMaterialManager.cxx 1042 additions, 0 deletions

...tDetDescr/ScintGeoModelUtils/src/ScintMaterialManager.cxx
Scintillator/ScintDetDescr/ScintGeoModelUtils/src/TopLevelPlacements.cxx 123 additions, 0 deletions

...intDetDescr/ScintGeoModelUtils/src/TopLevelPlacements.cxx
Scintillator/ScintDetDescr/ScintGeoModelUtils/src/TubeVolData.cxx 101 additions, 0 deletions

...ator/ScintDetDescr/ScintGeoModelUtils/src/TubeVolData.cxx
Scintillator/ScintDetDescr/ScintReadoutGeometry/ScintReadoutGeometry/ScintDetectorManager.h 7 additions, 4 deletions

...adoutGeometry/ScintReadoutGeometry/ScintDetectorManager.h
Scintillator/ScintDetDescr/ScintReadoutGeometry/ScintReadoutGeometry/ScintNumerology.h 12 additions, 20 deletions

...intReadoutGeometry/ScintReadoutGeometry/ScintNumerology.h
Scintillator/ScintDetDescr/ScintReadoutGeometry/ScintReadoutGeometry/ScintNumerology.icc 9 additions, 16 deletions

...tReadoutGeometry/ScintReadoutGeometry/ScintNumerology.icc
Scintillator/ScintDetDescr/ScintReadoutGeometry/ScintReadoutGeometry/VetoDetectorManager.h 1 addition, 1 deletion

...eadoutGeometry/ScintReadoutGeometry/VetoDetectorManager.h

with 2168 additions and 98 deletions

Please register or to comment