Merge remote-tracking branch 'origin/FASERNU-04' into master-FASERNU-04 (74528207) · Commits · Charlotte Cavanagh / calypso

Commit 74528207 authored 1 year ago by FaserMC

Browse files

Merge remote-tracking branch 'origin/FASERNU-04' into master-FASERNU-04

parents c92a8868 cb69d58d

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Calorimeter/CaloDetDescr/EcalGeoModel/CMakeLists.txt 14 additions, 3 deletions

Calorimeter/CaloDetDescr/EcalGeoModel/CMakeLists.txt
Calorimeter/CaloDetDescr/EcalGeoModel/data/EcalTyvek04.gdml 3546 additions, 0 deletions

Calorimeter/CaloDetDescr/EcalGeoModel/data/EcalTyvek04.gdml
Control/CalypsoExample/GeoModelTest/CMakeLists.txt 11 additions, 2 deletions

Control/CalypsoExample/GeoModelTest/CMakeLists.txt
Control/CalypsoExample/GeoModelTest/python/Faser04TestConfig.py 68 additions, 0 deletions

...l/CalypsoExample/GeoModelTest/python/Faser04TestConfig.py
Control/CalypsoExample/GeoModelTest/python/TestBeam00TestConfig.py 0 additions, 0 deletions

...alypsoExample/GeoModelTest/python/TestBeam00TestConfig.py
Control/CalypsoExample/GeoModelTest/python/TestBeam01TestConfig.py 74 additions, 0 deletions

...alypsoExample/GeoModelTest/python/TestBeam01TestConfig.py
DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql 433 additions, 6 deletions

DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql
DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelInit.py 2 additions, 2 deletions

...Description/GeoModel/FaserGeoModel/python/GeoModelInit.py
DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx 1 addition, 1 deletion

DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx
FaserGeometryCommon/TrenchGeoModel/data/Trench.gdml 25 additions, 1 deletion

FaserGeometryCommon/TrenchGeoModel/data/Trench.gdml
FaserGeometryCommon/TrenchGeoModel/src/TrenchDetectorFactory.cxx 2 additions, 1 deletion

...ometryCommon/TrenchGeoModel/src/TrenchDetectorFactory.cxx
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerDataBase.cxx 4 additions, 0 deletions

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

...r/ScintDetDescr/PreshowerGeoModel/src/PreshowerDataBase.h
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerDetectorFactory.cxx 9 additions, 6 deletions

...tDescr/PreshowerGeoModel/src/PreshowerDetectorFactory.cxx
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerGeometryManager.cxx 10 additions, 0 deletions

...tDescr/PreshowerGeoModel/src/PreshowerGeometryManager.cxx
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerGeometryManager.h 3 additions, 0 deletions

...DetDescr/PreshowerGeoModel/src/PreshowerGeometryManager.h
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerStation.cxx 25 additions, 5 deletions

.../ScintDetDescr/PreshowerGeoModel/src/PreshowerStation.cxx
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerStation.h 3 additions, 0 deletions

...or/ScintDetDescr/PreshowerGeoModel/src/PreshowerStation.h
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerWrapping.cxx 55 additions, 0 deletions

...ScintDetDescr/PreshowerGeoModel/src/PreshowerWrapping.cxx
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerWrapping.h 42 additions, 0 deletions

...r/ScintDetDescr/PreshowerGeoModel/src/PreshowerWrapping.h

with 4329 additions and 27 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/FASERNU-04' into master-FASERNU-04