Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

GeoModel
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

e9877ea4

Commit e9877ea4 authored 4 years ago by Marilena Bandieramonte

Downloads
- Plain Diff

Merge branch 'master' of https://gitlab.cern.ch/GeoModelDev/GeoModel

parents c77e8cc5 671a22c6

Branches

Tags

1 merge request!20Change in GeoModelG4 to support Ether and HyperUranium handling in new geometry tags.

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 29 additions, 5 deletions

.gitlab-ci.yml
FullSimLight/CMakeLists.txt 10 additions, 2 deletions

FullSimLight/CMakeLists.txt
FullSimLight/MagneticField/MagFieldServices/CMakeLists.txt 5 additions, 0 deletions

FullSimLight/MagneticField/MagFieldServices/CMakeLists.txt
GeoModelG4/.gitlab-ci.yml 0 additions, 141 deletions

GeoModelG4/.gitlab-ci.yml
GeoModelG4/CI/Dockerfile 0 additions, 12 deletions

GeoModelG4/CI/Dockerfile
GeoModelG4/CI/setup_lcg.sh 0 additions, 23 deletions

GeoModelG4/CI/setup_lcg.sh
GeoModelG4/CMakeLists.txt 9 additions, 4 deletions

GeoModelG4/CMakeLists.txt
GeoModelG4/GeoMaterial2G4/CMakeLists.txt 4 additions, 1 deletion

GeoModelG4/GeoMaterial2G4/CMakeLists.txt
GeoModelG4/GeoSpecialShapes/CMakeLists.txt 4 additions, 0 deletions

GeoModelG4/GeoSpecialShapes/CMakeLists.txt
GeoModelG4/LICENSE 0 additions, 201 deletions

GeoModelG4/LICENSE
GeoModelTools/GDMLtoGM/CMakeLists.txt 6 additions, 3 deletions

GeoModelTools/GDMLtoGM/CMakeLists.txt
GeoModelTools/GeoModelXMLParser/CMakeLists.txt 4 additions, 3 deletions

GeoModelTools/GeoModelXMLParser/CMakeLists.txt
cmake/SetupXercesC.cmake 5 additions, 4 deletions

cmake/SetupXercesC.cmake

with 76 additions and 399 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment