Merge branch 'FaserDetectorIdRewrite' into 'master' (38938b0a) · Commits · Di Wang / calypso

Commit 38938b0a authored 5 years ago by Dave Casper

Merge branch 'FaserDetectorIdRewrite' into 'master'

Prototype readout geometry for Veto

See merge request faser/calypso!17

parents 6ec929c5 49a48b49

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx 4 additions, 5 deletions

DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx
DetectorDescription/FaserDetDescr/CMakeLists.txt 1 addition, 1 deletion

DetectorDescription/FaserDetDescr/CMakeLists.txt
DetectorDescription/FaserDetDescr/FaserDetDescr/FaserDetDescrDict.h 1 addition, 2 deletions

...scription/FaserDetDescr/FaserDetDescr/FaserDetDescrDict.h
DetectorDescription/FaserDetDescr/FaserDetDescr/FaserDetectorID.h 365 additions, 349 deletions

...Description/FaserDetDescr/FaserDetDescr/FaserDetectorID.h
DetectorDescription/FaserDetDescr/FaserDetDescr/FaserDetectorIDBase.h 0 additions, 470 deletions

...ription/FaserDetDescr/FaserDetDescr/FaserDetectorIDBase.h
DetectorDescription/FaserDetDescr/FaserDetDescr/selection.xml 1 addition, 2 deletions

...ctorDescription/FaserDetDescr/FaserDetDescr/selection.xml
DetectorDescription/FaserDetDescr/src/FaserDetectorID.cxx 1043 additions, 272 deletions

DetectorDescription/FaserDetDescr/src/FaserDetectorID.cxx
DetectorDescription/FaserDetDescr/src/FaserDetectorIDBase.cxx 0 additions, 1134 deletions

...ctorDescription/FaserDetDescr/src/FaserDetectorIDBase.cxx
DetectorDescription/FaserDetDescr/src/FaserDetectorIDHelper.cxx 2 additions, 2 deletions

...orDescription/FaserDetDescr/src/FaserDetectorIDHelper.cxx
DetectorDescription/FaserReadoutGeometry/FaserReadoutGeometry/FaserDetectorManager.h 2 additions, 2 deletions

...adoutGeometry/FaserReadoutGeometry/FaserDetectorManager.h
DetectorDescription/FaserReadoutGeometry/src/FaserDetectorManager.cxx 1 addition, 1 deletion

...ription/FaserReadoutGeometry/src/FaserDetectorManager.cxx
DetectorDescription/GeoModel/FaserGeoEditor/CMakeLists.txt 44 additions, 0 deletions

DetectorDescription/GeoModel/FaserGeoEditor/CMakeLists.txt
DetectorDescription/GeoModel/FaserGeoEditor/src/FaserDbMainWindow.cxx 37 additions, 0 deletions

...ription/GeoModel/FaserGeoEditor/src/FaserDbMainWindow.cxx
DetectorDescription/GeoModel/FaserGeoEditor/src/FaserDbMainWindow.h 25 additions, 0 deletions

...scription/GeoModel/FaserGeoEditor/src/FaserDbMainWindow.h
DetectorDescription/GeoModel/FaserGeoEditor/src/FaserGeoEditorApp.cxx 24 additions, 0 deletions

...ription/GeoModel/FaserGeoEditor/src/FaserGeoEditorApp.cxx
DetectorDescription/GeoModel/FaserGeoEditor/src/FaserGeoEditorApp.h 22 additions, 0 deletions

...scription/GeoModel/FaserGeoEditor/src/FaserGeoEditorApp.h
DetectorDescription/GeoModel/FaserGeoEditor/src/main.cxx 21 additions, 0 deletions

DetectorDescription/GeoModel/FaserGeoEditor/src/main.cxx
DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelInit.py 1 addition, 1 deletion

...Description/GeoModel/FaserGeoModel/python/GeoModelInit.py
DetectorDescription/IdDictDetDescrCnv/src/FaserIDDetDescrCnv.cxx 6 additions, 6 deletions

...rDescription/IdDictDetDescrCnv/src/FaserIDDetDescrCnv.cxx
Scintillator/ScintDetDescr/ScintGeoModel/ScintGeoModel/ScintGeoModelAthenaComps.h 0 additions, 32 deletions

...cr/ScintGeoModel/ScintGeoModel/ScintGeoModelAthenaComps.h

with 1600 additions and 2279 deletions

Please register or to comment