Merge branch 'master-faser4' into 'FASERNU-04' (d8e2ca15) · Commits · Charlotte Cavanagh / calypso

Commit d8e2ca15 authored 1 year ago by Dave Casper

Merge branch 'master-faser4' into 'FASERNU-04'

Master faser4

See merge request faser/calypso!356

parents 5ec0be0a 7c9d6208

No related branches found

No related tags found

No related merge requests 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 400 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
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
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerWrappingParameters.cxx 46 additions, 0 deletions

...scr/PreshowerGeoModel/src/PreshowerWrappingParameters.cxx
Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerWrappingParameters.h 31 additions, 0 deletions

...Descr/PreshowerGeoModel/src/PreshowerWrappingParameters.h
Scintillator/ScintDetDescr/TriggerGeoModel/src/TriggerDataBase.cxx 5 additions, 0 deletions

...tor/ScintDetDescr/TriggerGeoModel/src/TriggerDataBase.cxx

with 4350 additions and 24 deletions

Please register or to comment