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

Conflicts:
	.gitlab-ci.yml

pipe/pipe_v19d_tb_mcbm.geo.info

+SIS-18 mCBM beam pipe geometry created with create_bpipe_geometry_v19d.C
+Introducing the target chamber derived from CAD drawings.
+
+The targetbox and the pipe after the targetbox are implemented
+into two different TGeoVolumeAssemblies and exported into two
+different output files which both needs to be loaded in the
+simulation. This separation was done due to work around a
+problem with the TGeoManager.
+
+The beam pipe is composed of iron with a varying wall thickness.
+
+Material:  iron

pipe/pipe_v19f_mcbm.geo.info

+SIS-18 mCBM beam pipe geometry created with create_bpipe_geometry_v19f.C
+Introducing the target chamber derived from CAD drawings.
+
+The beam pipe is composed of iron with a varying wall thickness.
+
+Material:  iron

pipe/pipe_v19g_mcbm.geo.info

+SIS-18 mCBM beam pipe geometry created with create_bpipe_geometry_v19g.C
+Introducing the target chamber derived from CAD drawings.
+
+The beam pipe is composed of iron with a varying wall thickness.
+
+Material:  iron

pipe/pipe_v19h_mcbm.geo.info

+SIS-18 mCBM beam pipe geometry created with create_bpipe_geometry_v19h.C
+Introducing the target chamber derived from CAD drawings.
+
+The beam pipe is composed of iron with a varying wall thickness.
+
+Material:  iron

pipe/pipe_v20a_1m.geo.info

+SIS-100. Beam pipe geometry created with create_bpipe_geometry_v20a_1m.C
+
+pipe_v20a_1m = pipe for the SIS100
+
+Sections: MVD + STS + MUCH + TRD + TOF + PSD
+Beam pipe behind MUCH with R=95mm
+Beam pipe stops @ 19 m from target with 0.2 mm Fe
+Material:  carbon
+Thickness: 0.5 mm
+
+
+Beam pipe section: pipe1 - vacuum chamber
+ i      Z,mm    Rin,mm   Rout,mm      h,mm
+ 1    -50.00     25.00     25.70      0.70
+ 2     -5.00     25.00     25.70      0.70
+ 3     -5.00    400.00    400.70      0.70
+ 4    230.17    400.00    400.70      0.70
+ 5    230.17    110.00    400.70    290.70
+ 6    230.87    110.00    130.70     20.70
+
+Beam pipe section: pipe2 - first window @ 220mm, h=0.7mm, R=600mm
+ i      Z,mm    Rin,mm   Rout,mm      h,mm
+ 1    220.00     18.00     18.00      0.00
+ 2    220.70     18.00     28.69     10.69
+ 3    221.45     30.00     39.30      9.30
+ 4    223.71     60.00     65.55      5.55
+ 5    227.49     90.00     94.14      4.14
+ 6    230.17    105.86    110.00      4.14
+ 7    230.87    110.00    110.00      0.00
+
+Beam pipe section: pipe3 - STS section
+ i      Z,mm    Rin,mm   Rout,mm      h,mm
+ 1    220.00     17.50     18.00      0.50
+ 2    500.00     17.50     18.00      0.50
+ 3   1250.00     54.50     55.00      0.50
+ 4   1700.00     73.70     74.20      0.50
+
+Beam pipe section: pipe4 - MUCH/RICH section
+ i      Z,mm    Rin,mm   Rout,mm      h,mm
+ 1   1700.00     72.72     74.20      1.48
+ 2   3700.00    157.90    161.10      3.20
+
+Beam pipe section: pipe5 - TRD-ToF section
+ i      Z,mm    Rin,mm   Rout,mm      h,mm
+ 1   3702.00     94.50     95.00      0.50
+ 2   9000.00     94.50     95.00      0.50
+
+Beam pipe section: pipe6 - second window @ the end, h=0.2mm, R=161.1mm, material: iron
+ i      Z,mm    Rin,mm   Rout,mm      h,mm
+ 1   3702.00      0.00    161.10    161.10
+ 2   3702.20      0.00    161.10    161.10
+
+Beam pipe section: pipe7 - PSD section
+ i      Z,mm    Rin,mm   Rout,mm      h,mm
+ 1   9000.20     94.50     95.00      0.50
+ 2  19000.00     94.50     95.00      0.50
+
+Beam pipe section: pipe8 - second window @ the end, h=0.2mm, R=95mm, material: iron
+ i      Z,mm    Rin,mm   Rout,mm      h,mm
+ 1  19000.00      0.00     95.00     95.00
+ 2  19000.20      0.00     95.00     95.00

pipe/pipe_v20a_mcbm.geo.info

+SIS-18 mCBM beam pipe geometry created with create_bpipe_geometry_v20a.C
+Introducing the target chamber derived from CAD drawings.
+
+The beam pipe is composed of iron with a varying wall thickness.
+
+Material:  pipeiron

psd/psd_v17a.geo.info

+PSD geometry v17a created with create_psdgeo.C
+
+Author: Volker Friese
+This geometry corresponds to the one which was implemented in CbmPsdv1, with small exceptions: the channel for the fibres is at the top of the module.
+
+Number of modules: 7 x 7
+Module size: 20 cm x 20 cm
+PSD translation in cave: (11, 0, 800) cm
+PSD rotation around y axis: 0 degrees
+
+Parameters of module module2060: 
+Size: 20 cm x 20 cm
+Number of layers: 60
+Thickness of lead layers: 1.6 cm
+Thickness of scintillators: 0.4 cm
+Thickness of Tyvek wrap: 0.02 cm
+Thickness of iron box: (0.15 / 0.05 / 2) cm
+Height of fibre channel: 0.2 cm
+Distance of channel from edges: left 0.5 cm, right 2 cm
+
+PSD size is 140 cm x 140 cm x 124.8 cm
+PSD contains 44 modules.

psd/psd_v17b.geo.info

+PSD geometry v17b created with create_psdgeo.C
+
+Number of modules: 7 x 7
+Module size: 20 cm x 20 cm
+PSD translation in cave: (10, 0, 1500) cm
+PSD rotation around y axis: 0 degrees
+
+Parameters of module module2060: 
+Size: 20 cm x 20 cm
+Number of layers: 60
+Thickness of lead layers: 1.6 cm
+Thickness of scintillators: 0.4 cm
+Thickness of Tyvek wrap: 0.02 cm
+Thickness of iron box: (0.15 / 0.05 / 2) cm
+Height of fibre channel: 0.2 cm
+Distance of channel from edges: left 0.5 cm, right 2 cm
+
+PSD size is 140 cm x 140 cm x 124.8 cm
+PSD contains 44 modules.