Commit d3b650ba authored by Eoin Clerkin's avatar Eoin Clerkin
Browse files

Merge branch 'master' of git.cbm.gsi.de:CbmSoft/cbmroot_geometry into master2

Conflicts:
	.gitlab-ci.yml
parents 7f6a2088 3bb7564c
stages: stages:
- checkRepository - checkRepository
- checkFormat - checkFormat
<<<<<<< HEAD
- build - build
- documentation - documentation
...@@ -10,17 +11,34 @@ RebaseCheck: ...@@ -10,17 +11,34 @@ RebaseCheck:
GIT_DEPTH: 100 GIT_DEPTH: 100
tags: tags:
- CbmRoot - CbmRoot
=======
RebaseCheck:
stage: checkRepository
image: alpine
tags:
- docker
>>>>>>> 3bb7564c1f3983233a72370527a32a8be1c86ffd
only: only:
refs: refs:
- merge_requests - merge_requests
variables: variables:
<<<<<<< HEAD
- $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
=======
- $CI_MERGE_REQUEST_PROJECT_PATH == "CbmSoft/cbmroot_geometry" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
>>>>>>> 3bb7564c1f3983233a72370527a32a8be1c86ffd
script: script:
# Get the upstream repository manually. I did not find any other way to have it for # Get the upstream repository manually. I did not find any other way to have it for
# comparison # comparison
# Check if a rebase is needed # Check if a rebase is needed
# If a rebase is needed stop immediately # If a rebase is needed stop immediately
<<<<<<< HEAD
- scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL - scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
=======
- apk update && apk add git bash
- ci_scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
>>>>>>> 3bb7564c1f3983233a72370527a32a8be1c86ffd
- git fetch upstream - git fetch upstream
- hash1=$(git show-ref upstream/master | cut -f1 -d' ') - hash1=$(git show-ref upstream/master | cut -f1 -d' ')
- hash2=$(git merge-base upstream/master origin/$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME) - hash2=$(git merge-base upstream/master origin/$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME)
...@@ -37,21 +55,36 @@ RebaseCheck: ...@@ -37,21 +55,36 @@ RebaseCheck:
LinearHistCheck: LinearHistCheck:
stage: checkRepository stage: checkRepository
<<<<<<< HEAD
variables: variables:
GIT_DEPTH: 100 GIT_DEPTH: 100
tags: tags:
- CbmRoot - CbmRoot
=======
image: alpine
tags:
- docker
>>>>>>> 3bb7564c1f3983233a72370527a32a8be1c86ffd
only: only:
refs: refs:
- merge_requests - merge_requests
variables: variables:
<<<<<<< HEAD
- $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
=======
- $CI_MERGE_REQUEST_PROJECT_PATH == "CbmSoft/cbmroot_geometry" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
>>>>>>> 3bb7564c1f3983233a72370527a32a8be1c86ffd
script: script:
# Get the upstream repository manually. I did not find any other way to have it for # Get the upstream repository manually. I did not find any other way to have it for
# comparison # comparison
# Check if the history introduced by the MR is linear (no branch loop in fork) # Check if the history introduced by the MR is linear (no branch loop in fork)
# If not linear stop immediately # If not linear stop immediately
<<<<<<< HEAD
- scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL - scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
=======
- apk update && apk add git bash
- ci_scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
>>>>>>> 3bb7564c1f3983233a72370527a32a8be1c86ffd
- git fetch upstream - git fetch upstream
- count=$(git rev-list --min-parents=2 --count upstream/master..HEAD) - count=$(git rev-list --min-parents=2 --count upstream/master..HEAD)
- echo "${count}" - echo "${count}"
...@@ -64,14 +97,23 @@ LinearHistCheck: ...@@ -64,14 +97,23 @@ LinearHistCheck:
- exit 1 - exit 1
- fi - fi
<<<<<<< HEAD
FormatCheck: FormatCheck:
stage: checkFormat stage: checkFormat
tags: tags:
- CbmRoot - CbmRoot
=======
FileFormatCheck:
stage: checkFormat
image: alpine
tags:
- docker
>>>>>>> 3bb7564c1f3983233a72370527a32a8be1c86ffd
only: only:
refs: refs:
- merge_requests - merge_requests
variables: variables:
<<<<<<< HEAD
- $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
script: script:
# Get the upstream repository manually. I did not find any other way to have it for # Get the upstream repository manually. I did not find any other way to have it for
...@@ -199,3 +241,13 @@ pages: ...@@ -199,3 +241,13 @@ pages:
- public - public
only: only:
- nightly_master - nightly_master
=======
- $CI_MERGE_REQUEST_PROJECT_PATH == "CbmSoft/cbmroot_geometry" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
script:
# Get the upstream repository manually. I did not find any other way to have it for
# comparison
- apk update && apk add git bash file
- ci_scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
- git fetch upstream
- ci_scripts/check-file-format.sh upstream
>>>>>>> 3bb7564c1f3983233a72370527a32a8be1c86ffd
cave
BOX
air
20000 -20000 -20000
20000 20000 -20000
-20000 20000 -20000
-20000 -20000 -20000
20000 -20000 20000
20000 20000 20000
-20000 20000 20000
-20000 -20000 20000
#!/bin/bash
if [[ $# -eq 1 ]]; then
UPSTREAM=$1
else
if [ -z $UPSTREAM ]; then
UPSTREAM=$(git remote -v | grep git.cbm.gsi.de[:/]computing/cbmroot | cut -f1 | uniq)
if [ -z $UPSTREAM ]; then
echo "Error: Name of upstream repository not provided and not found by automatic means"
echo 'Please provide if by checking your remotes with "git remote -v" and exporting UPSTREAM'
echo "or passing as an argument"
exit -1
fi
fi
fi
BASE_COMMIT=$UPSTREAM/master
CHANGED_FILES=$(git diff --name-only $BASE_COMMIT)
for file in $CHANGED_FILES; do
result=$(file $file | grep CRLF)
if [[ "$result" != "" ]]; then
echo ""
echo "File $file has wrong file format"
echo "$result"
echo ""
okay=false
fi
done
if [[ "$okay" = "false" ]]; then
echo ""
echo "Not all files have the correct file format"
echo "Test failed"
exit 1
else
exit 0
fi
#!/bin/bash
upstream_repo=$1
bla=$(git remote -v | grep upstream)
if [ $? -eq 0 ]; then
echo "Remote link upstream already exist"
bla=$(git remote -v | grep upstream | grep $upstream_repo)
if [ $? -eq 0 ]; then
echo "Remote link upstream already exist and points to the correct repo"
# dont do anything
else
echo "Remote link upstream already exist and points to the wrong repo"
git remote rm upstream
git remote add upstream $upstream_repo
fi
else
echo "Remote repo has to be connected"
git remote add upstream $upstream_repo
fi
ROOT geometry of the CBM magnet
Based on the CAD design of BINP Novosibirsk, November 2018.
MC model by Egor Ovcharenko (evovch@gmail.com).
Version with field clamps, meant for being used with the RICH system (electron setups).
A GDML geometry was created from the original CATIA design files. The GDML geometry was converted into ROOT TGeo format by A. Senger, using the macro macro/geometry/gdml2root.C.
The most substantial difference to the previous geometry (v15a) is the increase in the vertical aperture to 1,440 mm. The field clamps are 190 mm thick.
ROOT geometry of the CBM magnet
Based on the CAD design of BINP Novosibirsk, November 2018.
MC model by Egor Ovcharenko (evovch@gmail.com).
Version v18b is the same as v18a, but without field clamps. It is meant for being used with the MUCH system (muon setup).
A GDML geometry was created from the original CATIA design files. The GDML geometry was converted into ROOT TGeo format by A. Senger, using the macro macro/geometry/gdml2root.C.
The most substantial difference to the previous geometry (v15b_much) is the increase in the vertical aperture to 1,440 mm.
This diff is collapsed.
MUCH geometry created with create_MUCH_geometry_v19c_lmvm.C
Global Variables:
MuchCave Zin position = 125 cm
Acceptance tangent min = 0.1
Acceptance tangent max = 0.466
Absorbers
-----------
Total No. of Absorbers: 7
First abosrber is divided into two halves.
First half inserted inside the Dipole Magnet.
Second half is made of Low Density Graphite + Concrete.
Total No. of Pieces: 7
AbsPieces Position[cm] Thickness[cm] Material
--------------------------------------------------------------
1 133 16 LD Graphite
2 148 14 LD Graphite
3 170 30 Concrete
4 225 20 Iron
5 275 20 Iron
6 330 30 Iron
7 425 100 Iron
Shielding
-----------
No. of Shields: 6
Inside the Abs I, Shielding divided into two parts.
Shield No. Z_In[cm] Z_Out[cm] R_In[cm] R_Out[cm] Material
--------------------------------------------------------------
0 125 155 7.375 12.499 Al
1 155 185 8.665 15.499 Pb
2 215 235 12.965 21.499 Al
3 265 285 15.515 26.499 Al
4 315 345 18.065 31.499 Al
5 375 475 23.000 23.000 Al
Stations
----------
No. of Stations: 4
First two stations (1,2) are made up of GEM and last two stations (3,4) are made up of RPC.
10 mm thick Al plates are used for support and cooling in the GEM modules.
2 mm thick Aluminum plates are used for support in the RPC modules behind the active area. 10 mm thick Aluminium at the boundaries as the frame.
Drift and read-out PCBs (copper coated G10 plates) inserted for realistic material budget for both GEM and RPC modules.
#Station #Layers Z[cm] #Sectors ActiveLz[cm]
--------------------------------------------------------------
1 1 190 16 0.3
1 2 200 16 0.3
1 3 210 16 0.3
2 1 240 20 0.3
2 2 250 20 0.3
2 3 260 20 0.3
3 1 290 18 0.2
3 2 300 18 0.2
3 3 310 18 0.2
4 1 350 20 0.2
4 2 360 20 0.2
4 3 370 20 0.2
MUCH geometry created with create_MUCH_geometry_v19c_lmvm.C
Global Variables:
MuchCave Zin position = 125 cm
Acceptance tangent min = 0.1
Acceptance tangent max = 0.466
Absorbers
-----------
Total No. of Absorbers: 4
First abosrber is divided into two halves.
First half inserted inside the Dipole Magnet.
Second half is made of Low Density Graphite + Concrete.
Total No. of Pieces: 6
AbsPieces Position[cm] Thickness[cm] Material
--------------------------------------------------------------
1 133 16 LD Graphite
2 148 14 LD Graphite
3 170 30 Concrete
4 225 20 Iron
5 275 20 Iron
6 330 30 Iron
Shielding
-----------
No. of Shields: 5
Inside the Abs I, Shielding divided into two parts.
Shield No. Z_In[cm] Z_Out[cm] R_In[cm] R_Out[cm] Material
--------------------------------------------------------------
0 125 155 7.375 12.4999 Al
1 155 185 8.665 15.4999 Pb
2 215 235 12.965 21.4999 Al
3 265 285 15.515 26.4999 Al
4 315 345 18.065 31.4999 Al
Stations
----------
No. of Stations: 4
First two stations (1,2) are made up of GEM and last two stations (3,4) are made up of RPC.
10 mm thick Al plates are used for support and cooling in the GEM modules.
2 mm thick Aluminum plates are used for support in the RPC modules behind the active area. 10 mm thick Aluminium at the boundaries as the frame.
Drift and read-out PCBs (copper coated G10 plates) inserted for realistic material budget for both GEM and RPC modules.
#Station #Layers Z[cm] #Sectors ActiveLz[cm]
--------------------------------------------------------------
1 1 190 16 0.3
1 2 200 16 0.3
1 3 210 16 0.3
2 1 240 20 0.3
2 2 250 20 0.3
2 3 260 20 0.3
3 1 290 18 0.2
3 2 300 18 0.2
3 3 310 18 0.2
4 1 350 20 0.2
4 2 360 20 0.2
4 3 370 20 0.2
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment