Merge branch 'master-geo-field' into 'master' (fe8aedac) · Commits · Charlotte Cavanagh / calypso

Commit fe8aedac authored 5 years ago by Dave Casper

Merge branch 'master-geo-field' into 'master'

Add dipoles to geometry, simulation and display

See merge request !34

parents 852f26ff 152a6f45

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql 68 additions, 18 deletions

DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql
DetectorDescription/GeoModel/FaserGeoModel/python/DipoleGMConfig.py 60 additions, 0 deletions

...scription/GeoModel/FaserGeoModel/python/DipoleGMConfig.py
DetectorDescription/GeoModel/FaserGeoModel/python/FaserGeoModelConfig.py 10 additions, 4 deletions

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

...Description/GeoModel/FaserGeoModel/python/GeoModelInit.py
DetectorDescription/GeoModel/FaserGeoModel/python/SCTGMConfig.py 6 additions, 6 deletions

...rDescription/GeoModel/FaserGeoModel/python/SCTGMConfig.py
DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py 2 additions, 2 deletions

...escription/GeoModel/FaserGeoModel/python/ScintGMConfig.py
DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py 7 additions, 3 deletions

...Model/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py
DetectorDescription/GeoModel/GeoModelFaserUtilities/src/DecodeFaserVersionKey.cxx 3 additions, 0 deletions

...odel/GeoModelFaserUtilities/src/DecodeFaserVersionKey.cxx
DetectorDescription/GeoModel/GeoModelInterfaces/GeoModelInterfaces/IGeoDbTagSvc.h 4 additions, 2 deletions

...odel/GeoModelInterfaces/GeoModelInterfaces/IGeoDbTagSvc.h
DetectorDescription/GeoModel/GeoModelInterfaces/GeoModelInterfaces/IGeoModelSvc.h 2 additions, 0 deletions

...odel/GeoModelInterfaces/GeoModelInterfaces/IGeoModelSvc.h
DetectorDescription/GeoModel/GeoModelSvc/src/GeoDbTagSvc.cxx 4 additions, 0 deletions

DetectorDescription/GeoModel/GeoModelSvc/src/GeoDbTagSvc.cxx
DetectorDescription/GeoModel/GeoModelSvc/src/GeoDbTagSvc.h 5 additions, 0 deletions

DetectorDescription/GeoModel/GeoModelSvc/src/GeoDbTagSvc.h
DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx 29 additions, 0 deletions

DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx
DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h 3 additions, 0 deletions

DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h
DetectorDescription/GeoModel/GeoModelTest/python/GeoModelTestConfig.py 5 additions, 0 deletions

...iption/GeoModel/GeoModelTest/python/GeoModelTestConfig.py
Simulation/G4Faser/G4FaserApp/test/runG4.py 7 additions, 1 deletion

Simulation/G4Faser/G4FaserApp/test/runG4.py
Simulation/G4Faser/G4FaserTools/python/G4GeometryToolConfig.py 12 additions, 0 deletions

...ation/G4Faser/G4FaserTools/python/G4GeometryToolConfig.py
Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt 45 additions, 0 deletions

Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt
Tracker/TrackerDetDescr/DipoleGeoModel/DipoleGeoModel/DipoleDataBase.h 58 additions, 0 deletions

...erDetDescr/DipoleGeoModel/DipoleGeoModel/DipoleDataBase.h
Tracker/TrackerDetDescr/DipoleGeoModel/DipoleGeoModel/DipoleFactory.h 42 additions, 0 deletions

...kerDetDescr/DipoleGeoModel/DipoleGeoModel/DipoleFactory.h

with 377 additions and 36 deletions

Please register or to comment