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:
- checkRepository
- checkFormat
<<<<<<< HEAD
- build
- documentation
......@@ -10,17 +11,34 @@ RebaseCheck:
GIT_DEPTH: 100
tags:
- CbmRoot
=======
RebaseCheck:
stage: checkRepository
image: alpine
tags:
- docker
>>>>>>> 3bb7564c1f3983233a72370527a32a8be1c86ffd
only:
refs:
- merge_requests
variables:
<<<<<<< HEAD
- $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:
# Get the upstream repository manually. I did not find any other way to have it for
# comparison
# Check if a rebase is needed
# If a rebase is needed stop immediately
<<<<<<< HEAD
- 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
- hash1=$(git show-ref upstream/master | cut -f1 -d' ')
- hash2=$(git merge-base upstream/master origin/$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME)
......@@ -37,21 +55,36 @@ RebaseCheck:
LinearHistCheck:
stage: checkRepository
<<<<<<< HEAD
variables:
GIT_DEPTH: 100
tags:
- CbmRoot
=======
image: alpine
tags:
- docker
>>>>>>> 3bb7564c1f3983233a72370527a32a8be1c86ffd
only:
refs:
- merge_requests
variables:
<<<<<<< HEAD
- $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:
# Get the upstream repository manually. I did not find any other way to have it for
# comparison
# Check if the history introduced by the MR is linear (no branch loop in fork)
# If not linear stop immediately
<<<<<<< HEAD
- 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
- count=$(git rev-list --min-parents=2 --count upstream/master..HEAD)
- echo "${count}"
......@@ -64,14 +97,23 @@ LinearHistCheck:
- exit 1
- fi
<<<<<<< HEAD
FormatCheck:
stage: checkFormat
tags:
- CbmRoot
=======
FileFormatCheck:
stage: checkFormat
image: alpine
tags:
- docker
>>>>>>> 3bb7564c1f3983233a72370527a32a8be1c86ffd
only:
refs:
- merge_requests
variables:
<<<<<<< HEAD
- $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
script:
# Get the upstream repository manually. I did not find any other way to have it for
......@@ -199,3 +241,13 @@ pages:
- public
only:
- 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.
// Media used for CBM geometries
// see https://fairroot.gsi.de/?q=node/34
// ----- Vacuum ----------------------------------------------------------
vacuum 1 1.e-16 1.e-16 1.e-16
0 1 20. .001
0
// ---------------------------------------------------------------------------
// ----- Elements --------------------------------------------------------
beryllium 1 9.01 4.0 1.848
0 0 20. .001
0
carbon 1 12.011 6.0 2.265
0 1 20. .001
0
aluminium 1 26.98 13. 2.7
0 1 20. .001
0
silicon 1 28.0855 14.0 2.33
1 1 20. .001
0
iron 1 55.847 26. 7.87
1 1 20. .001
0
gold 1 196.97 79. 19.3
0 1 20. .001
0
lead 1 207.1 82. 11.34
0 1 20. .001
0
// ---------------------------------------------------------------------------
pipeiron 1 55.847 26. 7.87
0 1 20. .001
0
// Acording to document from Acidur 4301 Werkstaoffdatenblatt X5CrNi18-10 1.4301
// Fe C Si Mn P S Cr Ni N (EN 10088-3)
// Mass concentrations taken half way between min and max acceptable.
pipesteel 9 55.845 12.011 28.0855 54.93805 30.973762 32.066 51.9961 58.6934 14.00674 26 6 14 25 15 16 24 28 7 7.9 0.701775 0.00035 0.005 0.01 0.000225 0.00015 0.185 0.0925 0.005
0 1 20. .001
0
// ---------------------------------------------------------------------------
// ----- Air at 20 degrees C ----------------------------------------------
air 3 14.01 16. 39.95 7. 8. 18. 1.205e-3 .78 .21 .01
0 1 20. .001
0
// ---------------------------------------------------------------------------
// ----- Media for the PSD ------------------------------------------------
// --- Tyvek: 86% carbon, 14% hydrogen
PsdTyvek 2 12.011 1.008 6. 1. 0.930 0.8562772 0.1437220
0 0 20. 0.001
0
// --- Plastic (Scintillator), active, 92% carbon, 8% hydrogen
PsdScint 2 12.011 1.008 6. 1. 1.032 0.9225687 0.0774313
1 0 20. 0.001
0
// --- Plastic (Fibres), passive, same as for scintillator
PsdFibre 2 12.011 1.008 6. 1. 1.032 0.9225687 0.0774313
0 0 20. 0.001
0
// —— Borated polyethylene for PSD shielding
PsdPolyethylene 3 12.01 1.01 10.81 6. 1. 5. 1.12 0.825 0.14 0.035
0 1 20. 0.001
0
// ---------------------------------------------------------------------------
magAl 1 26.98 13. 2.7
1 1 20. .001
0
RPCgas -4 12. 1. 19. 32. 6. 1. 9. 16. 4.27e-3 1.9 2.2 4. 0.1
1 1 15. .001
0
RPCgas_noact -4 12. 1. 19. 32. 6. 1. 9. 16. 4.27e-3 1.9 2.2 4. 0.1
0 1 15. .001
0
RPCglass -4 16. 28. 23. 40. 8. 14. 11. 20. 2.5 1.894 0.735 0.159 0.106
0 1 15. .001
0
Rohacell -3 1.00794 12.0107 15.9994 1. 6. 8. 0.075 8. 5. 2.
0 1 30. .001
0
RICHglass -2 28.09 16. 14. 8. 2.2 1. 2.
1 0 20. .0001
61
6.1997 0.22529 1.0 -1
5.9045 0.1862 1.0 -1
5.6361 0.15901 1.0 -1
5.391 0.14713 1.0 -1
5.1664 0.13963 1.0 -1
4.9598 0.13898 1.0 -1
4.769 0.13762 1.0 -1
4.5924 0.13622 1.0 -1
4.4284 0.13868 1.0 -1
4.2757 0.13951 1.0 -1
4.1331 0.14031 1.0 -1
3.9998 0.14073 1.0 -1
3.8748 0.1409 1.0 -1
3.7574 0.13977 1.0 -1
3.6469 0.14205 1.0 -1
3.5427 0.14072 1.0 -1
3.4443 0.1396 1.0 -1
3.3512 0.13826 1.0 -1
3.263 0.13665 1.0 -1
3.1793 0.13513 1.0 -1
3.0998 0.13463 1.0 -1
3.0242 0.13287 1.0 -1
2.9522 0.13182 1.0 -1
2.8836 0.13084 1.0 -1
2.818 0.12824 1.0 -1
2.7554 0.12601 1.0 -1
2.6955 0.12622 1.0 -1
2.6382 0.12681 1.0 -1
2.5832 0.12193 1.0 -1
2.5305 0.12011 1.0 -1
2.4799 0.12109 1.0 -1
2.4313 0.11908 1.0 -1
2.3845 0.11526 1.0 -1
2.3395 0.11364 1.0 -1
2.2962 0.11385 1.0 -1
2.2544 0.12015 1.0 -1
2.2142 0.11935 1.0 -1
2.1753 0.11712 1.0 -1
2.1378 0.1208 1.0 -1
2.1016 0.12021 1.0 -1
2.0666 0.11909 1.0 -1
2.0327 0.11783 1.0 -1
1.9999 0.12257 1.0 -1
1.9682 0.1215 1.0 -1
1.9374 0.12199 1.0 -1
1.9076 0.12494 1.0 -1
1.8787 0.13101 1.0 -1
1.8507 0.12089 1.0 -1
1.8234 0.12284 1.0 -1
1.797 0.12569 1.0 -1
1.7713 0.13136 1.0 -1
1.7464 0.13307 1.0 -1
1.7221 0.13705 1.0 -1
1.6985 0.13844 1.0 -1
1.6756 0.13753 1.0 -1
1.6533 0.14416 1.0 -1
1.6315 0.14761 1.0 -1
1.6103 0.14953 1.0 -1
1.5897 0.15218 1.0 -1
1.5695 0.15315 1.0 -1
1.5499 0.15719 1.0 -1
RICHglassHADES -2 28.09 16. 14. 8. 2.2 1. 2.
1 0 20. .0001
53
1.77 0.230 1.0 0
5.636 0.230 1.0 0
5.687 0.242 1.0 0
5.740 0.249 1.0 0
5.794 0.239 1.0 0
5.848 0.245 1.0 0
5.904 0.247 1.0 0
5.961 0.248 1.0 0
6.019 0.254 1.0 0
6.078 0.258 1.0 0
6.138 0.247 1.0 0
6.199 0.262 1.0 0
6.262 0.264 1.0 0
6.326 0.260 1.0 0
6.391 0.267 1.0 0
6.458 0.263 1.0 0
6.526 0.263 1.0 0
6.595 0.276 1.0 0
6.666 0.278 1.0 0
6.738 0.274 1.0 0
6.813 0.275 1.0 0
6.888 0.283 1.0 0
6.966 0.276 1.0 0
7.045 0.287 1.0 0
7.126 0.288 1.0 0
7.209 0.291 1.0 0
7.293 0.287 1.0 0
7.380 0.298 1.0 0
7.469 0.287 1.0 0
7.560 0.278 1.0 0
7.654 0.259 1.0 0
7.749 0.239 1.0 0
7.847 0.253 1.0 0
7.948 0.253 1.0 0
8.051 0.273 1.0 0
8.157 0.264 1.0 0
8.266 0.270 1.0 0
8.378 0.263 1.0 0
8.492 0.275 1.0 0
8.610 0.285 1.0 0
8.732 0.319 1.0 0
8.856 0.314 1.0 0
8.985 0.335 1.0 0
9.117 0.359 1.0 0
9.253 0.378 1.0 0
9.393 0.426 1.0 0
9.538 0.457 1.0 0
9.687 0.55 1.0 0
9.840 0.64 1.0 0
9.999 0.73 1.0 0
10.163 0.85 1.0 0
10.33 0.95 1.0 0
10.5 1. 1.0 0
RICHglassJLO -2 28.09 16. 14. 8. 2.2 1. 2.
1 0 20. .0001
63
1.5485 0.1572 1.0 0
1.5681 0.1532 1.0 0
1.5882 0.1522 1.0 0
1.6089 0.1495 1.0 0
1.6300 0.1476 1.0 0
1.6518 0.1442 1.0 0
1.6741 0.1375 1.0 0
1.6970 0.1384 1.0 0
1.7206 0.1371 1.0 0
1.7448 0.1331 1.0 0
1.7698 0.1314 1.0 0
1.7954 0.1257 1.0 0
1.8218 0.1228 1.0 0
1.8490 0.1209 1.0 0
1.8770 0.1310 1.0 0
1.9059 0.1249 1.0 0
1.9357 0.1220 1.0 0
1.9664 0.1215 1.0 0
1.9981 0.1226 1.0 0
2.0309 0.1178 1.0 0
2.0647 0.1191 1.0 0
2.0997 0.1202 1.0 0
2.1359 0.1208 1.0 0
2.1734 0.1171 1.0 0
2.2122 0.1194 1.0 0
2.2524 0.1201 1.0 0
2.2941 0.1138 1.0 0
2.3374 0.1136 1.0 0
2.3824 0.1153 1.0 0
2.4291 0.1191 1.0 0
2.4777 0.1211 1.0 0
2.5282 0.1201 1.0 0
2.5809 0.1219 1.0 0
2.6358 0.1268 1.0 0
2.6931 0.1262 1.0 0
2.7530 0.1260 1.0 0
2.8155 0.1282 1.0 0
2.8810 0.1308 1.0 0
2.9496 0.1318 1.0 0
3.0215 0.1329 1.0 0
3.0971 0.1346 1.0 0
3.1765 0.1351 1.0 0
3.2601 0.1367 1.0 0
3.3482 0.1383 1.0 0
3.4412 0.1396 1.0 0
3.5395 0.1407 1.0 0
3.6436 0.1420 1.0 0
3.7540 0.1398 1.0 0
3.8714 0.1409 1.0 0
3.9962 0.1407 1.0 0
4.1294 0.1403 1.0 0
4.2718 0.1395 1.0 0
4.4244 0.1387 1.0 0
4.5883 0.1362 1.0 0
4.7647 0.1376 1.0 0
4.9553 0.1390 1.0 0
5.1618 0.1396 1.0 0
5.3862 0.1471 1.0 0
5.6311 0.1590 1.0 0
5.8992 0.1862 1.0 0
6.1942 0.2253 1.0 0
6.5202 0.2503 1.0 0
6.8824 0.2603 1.0 0
CsI -2 132.9054 126.9045 55. 53. 4.53 1 1
1 1 20. .00001
2
1.77 50000. 1.0 1.0003
10.5 50000. 1.0 1.0003
PMTglass -2 28.09 16. 14. 8. 2.2 1. 2.
0 1 20. .00001
2
1.77 50000. 1.0 1.51
10.5 50000. 1.0 1.51
PMTvacuum 3 14.01 16. 39.95 7. 8. 18. 1.205e-10 .78 .21 .01
0 1 20. .001
2
1.77 100000. 1.0 1.0
10.5 100000. 1.0 1.0
RICHgas_He+CH4 -3 4. 12.01 1.008 2. 6. 1. 0.50164e-3 0.4 .6 2.4
0 1 20. .001
47
1.77 39979.997 1.0 1.0002804
5.636 39979.997 1.0 1.0002804
5.687 39979.997 1.0 1.0002804
5.740 39979.997 1.0 1.0002804
5.794 39979.997 1.0 1.0002804
5.848 39979.997 1.0 1.0002804
5.904 39979.997 1.0 1.0002804
5.961 39979.997 1.0 1.0002804
6.019 39979.997 1.0 1.0002804
6.078 39979.997 1.0 1.0002804
6.138 6191.159 1.0 1.0002804
6.199 16786.715 1.0 1.0002804
6.262 39979.997 1.0 1.0002804
6.326 19303.665 1.0 1.0002804
6.391 9979.987 1.0 1.0002804
6.458 39979.997 1.0 1.0002804
6.526 1834.355 1.0 1.0002804
6.595 39979.997 1.0 1.0002804
6.666 6494.637 1.0 1.0002804
6.738 2582.421 1.0 1.0002804
6.813 3504.191 1.0 1.0002804
6.888 1060.955 1.0 1.0002804
6.966 4385.256 1.0 1.0002804
7.045 3510.412 1.0 1.0002804
7.126 1192.744 1.0 1.0002804
7.209 2300.128 1.0 1.0002804
7.293 1811.428 1.0 1.0002804
7.380 10369.598 1.0 1.0002804
7.469 1154.628 1.0 1.0002804
7.560 790.368 1.0 1.0002804
7.654 546.007 1.0 1.0002804
7.749 2280.114 1.0 1.0002804
7.847 1161.569 1.0 1.0002804
7.948 914.652 1.0 1.0002804
8.051 776.007 1.0 1.0002804
8.157 514.786 1.0 1.0002804
8.266 148.141 1.0 1.0002804
8.378 37.484 1.0 1.0002804
8.492 16.643 1.0 1.0002804
8.610 8.0 1.0 1.0002804
8.732 4.0 1.0 1.0002804
8.856 2.0 1.0 1.0002804
8.985 1.0 1.0 1.0002804
9.117 0.0 1.0 1.0002804
9.253 0.0 1.0 1.0002804
9.393 0.0 1.0 1.0002804
9.538 0.0 1.0 1.0002804
RICHgas_He+CH4+ -3 4. 12.01 1.008 2. 6. 1. 0.50164e-3 0.4 .6 2.4
1 1 20. .001
47
1.77 39979.997 1.0 1.0002804
5.636 39979.997 1.0 1.0002804
5.687 39979.997 1.0 1.0002804
5.740 39979.997 1.0 1.0002804
5.794 39979.997 1.0 1.0002804
5.848 39979.997 1.0 1.0002804
5.904 39979.997 1.0 1.0002804
5.961 39979.997 1.0 1.0002804
6.019 39979.997 1.0 1.0002804
6.078 39979.997 1.0 1.0002804
6.138 6191.159 1.0 1.0002804
6.199 16786.715 1.0 1.0002804
6.262 39979.997 1.0 1.0002804
6.326 19303.665 1.0 1.0002804
6.391 9979.987 1.0 1.0002804
6.458 39979.997 1.0 1.0002804
6.526 1834.355 1.0 1.0002804
6.595 39979.997 1.0 1.0002804
6.666 6494.637 1.0 1.0002804
6.738 2582.421 1.0 1.0002804
6.813 3504.191 1.0 1.0002804
6.888 1060.955 1.0 1.0002804
6.966 4385.256 1.0 1.0002804
7.045 3510.412 1.0 1.0002804
7.126 1192.744 1.0 1.0002804
7.209 2300.128 1.0 1.0002804
7.293 1811.428 1.0 1.0002804
7.380 10369.598 1.0 1.0002804
7.469 1154.628 1.0 1.0002804
7.560 790.368 1.0 1.0002804
7.654 546.007 1.0 1.0002804
7.749 2280.114 1.0 1.0002804
7.847 1161.569 1.0 1.0002804
7.948 914.652 1.0 1.0002804
8.051 776.007 1.0 1.0002804
8.157 514.786 1.0 1.0002804
8.266 148.141 1.0 1.0002804
8.378 37.484 1.0 1.0002804
8.492 16.643 1.0 1.0002804
8.610 8.0 1.0 1.0002804
8.732 4.0 1.0 1.0002804
8.856 2.0 1.0 1.0002804
8.985 1.0 1.0 1.0002804
9.117 0.0 1.0 1.0002804
9.253 0.0 1.0 1.0002804
9.393 0.0 1.0 1.0002804
9.538 0.0 1.0 1.0002804
RICHgas_N2 -2 14. 14. 7 7 1.25e-3 1 1
0 1 20. .001
37
1.77 50000. 1.0 1.000298
7.293 50000. 1.0 1.000298
7.523 50000. 1.0 1.000298
7.653 1282.7 1.0 1.000298
7.725 755.3 1.0 1.000298
7.832 507.0 1.0 1.000298
8.009 238.1 1.0 1.000298
8.157 293.2 1.0 1.000298
8.238 229.7 1.0 1.000298
8.332 643.1 1.0 1.000298
8.377 197.0 1.0 1.000298
8.475 214.2 1.0 1.000298
8.521 50.7 1.0 1.000298