Skip to content

Commit f53abf9

Browse files
FrancescaCasilloFrancescaCasillo
authored
Merge branch 'master' into pwglf-antinuclei-mod
2 parents a1558a2 + 543e29b commit f53abf9

File tree

306 files changed

+14044
-6834
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

306 files changed

+14044
-6834
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v5.0.0
5+
rev: v6.0.0
66
hooks:
77
- id: trailing-whitespace
88
- id: end-of-file-fixer
99
- repo: https://github.com/pre-commit/mirrors-clang-format
10-
rev: v20.1.5 # clang-format version
10+
rev: v21.1.8 # clang-format version
1111
hooks:
1212
- id: clang-format
1313
- repo: https://github.com/cpplint/cpplint

‎ALICE3/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ add_subdirectory(Core)
1414
# add_subdirectory(DataModel)
1515
add_subdirectory(Tasks)
1616
add_subdirectory(TableProducer)
17-
# add_subdirectory(Tools)
17+
add_subdirectory(Macros)

‎ALICE3/Macros/CMakeLists.txt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2+
# See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
# All rights not expressly granted are reserved.
4+
#
5+
# This software is distributed under the terms of the GNU General Public
6+
# License v3 (GPL Version 3), copied verbatim in the file "COPYING".
7+
#
8+
# In applying this license CERN does not waive the privileges and immunities
9+
# granted to it by virtue of its status as an Intergovernmental Organization
10+
# or submit itself to any jurisdiction.
11+
12+
install(FILES Configuration/a3geo.ini
13+
Configuration/a3geometry_v2.ini
14+
Configuration/a3geometry_v3.ini
15+
Configuration/a3geometry_v4.ini
16+
PERMISSIONS GROUP_READ GROUP_EXECUTE OWNER_EXECUTE OWNER_WRITE OWNER_READ WORLD_EXECUTE WORLD_READ
17+
DESTINATION share/alice3/)

ALICE3/macros/a3geo.ini renamed to ALICE3/Macros/Configuration/a3geo.ini

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11
# Example of the ALICE3 geometry file in TEnv format
2+
# Example of layers configuration for FastTracker
3+
# Each layer is defined by a set of parameters
4+
# Format:
5+
# <layer_name>.<parameter>: <value>
6+
# Example:
7+
# layer1.r: 0.5 # radius in cm
8+
# layer1.z: 250 # half-length in cm
9+
# layer1.x0: 0.001 # radiation length
10+
# layer1.xrho: 0 # density in g/cm^2
11+
# layer1.resRPhi: 0.0001 # resolution in R-Phi in cm
12+
# layer1.resZ: 0.0001 # resolution in Z in cm
13+
# layer1.eff: 1.0 # efficiency (0 to 1)
14+
# layer1.type: 1 # type of layer (0: passive, 1: active)
15+
# layer1.deadPhiRegions: /path/to/dead_regions.root # optional dead regions file
16+
17+
218
bpipe0.r: 0.48
319
bpipe0.z: 250
420
bpipe0.x0: 0.001592
@@ -7,7 +23,6 @@ bpipe0.resRPhi: 0.0
723
bpipe0.resZ: 0.0
824
bpipe0.eff: 0.0
925
bpipe0.type: 0
10-
bpipe0.deadPhiRegions: /tmp/asd.root
1126

1227
B00.r: 0.5
1328
B00.z: 250
@@ -144,5 +159,4 @@ B10.resZ: 0.001
144159
B10.eff: 1.
145160
B10.type: 1
146161

147-
148-
162+
global.lutEl: /tmp/lutCovm.el.20kG.rmin20.geometry_v2.dat

‎ALICE3/Macros/Configuration/a3geometry_v2.ini‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
2+
3+
bpipe0.r: 0.48
4+
bpipe0.z: 250
5+
bpipe0.x0: 0.00042
6+
bpipe0.xrho: 2.772e-02
7+
bpipe0.resRPhi: 0.0f
8+
bpipe0.resZ: 0.0f
9+
bpipe0.eff: 0.0f
10+
bpipe0.type: 0
11+
12+
13+
B00.r: 0.5
14+
B00.z: 250
15+
B00.x0: 0.001
16+
B00.xrho: 2.3292e-02
17+
B00.resRPhi: 0.00025
18+
B00.resZ: 0.00025
19+
B00.eff: 1.00
20+
B00.type: 1
21+
22+
B01.r: 1.2
23+
B01.z: 250
24+
B01.x0: 0.001
25+
B01.xrho: 2.3292e-02
26+
B01.resRPhi: 0.00025
27+
B01.resZ: 0.00025
28+
B01.eff: 1.00
29+
B01.type: 1
30+
31+
B02.r: 2.5
32+
B02.z: 250
33+
B02.x0: 0.001
34+
B02.xrho: 2.3292e-02
35+
B02.resRPhi: 0.00025
36+
B02.resZ: 0.00025
37+
B02.eff: 1.00
38+
B02.type: 1
39+
40+
bpipe1.r: 3.7
41+
bpipe1.z: 250
42+
bpipe1.x0: 0.0014
43+
bpipe1.xrho: 9.24e-02
44+
bpipe1.resRPhi: 0.0f
45+
bpipe1.resZ: 0.0f
46+
bpipe1.eff: 0.0f
47+
bpipe1.type: 0
48+
49+
B03.r: 3.75
50+
B03.z: 250
51+
B03.x0: 0.01
52+
B03.xrho: 2.3292e-01
53+
B03.resRPhi: 0.001
54+
B03.resZ: 0.001
55+
B03.eff: 1.00
56+
B03.type: 1
57+
58+
B04.r: 7.
59+
B04.z: 250
60+
B04.x0: 0.01
61+
B04.xrho: 2.3292e-01
62+
B04.resRPhi: 0.001
63+
B04.resZ: 0.001
64+
B04.eff: 1.00
65+
B04.type: 1
66+
67+
B05.r: 12.
68+
B05.z: 250
69+
B05.x0: 0.01
70+
B05.xrho: 2.3292e-01
71+
B05.resRPhi: 0.001
72+
B05.resZ: 0.001
73+
B05.eff: 1.00
74+
B05.type: 1
75+
76+
B06.r: 20.
77+
B06.z: 250
78+
B06.x0: 0.01
79+
B06.xrho: 2.3292e-01
80+
B06.resRPhi: 0.001
81+
B06.resZ: 0.001
82+
B06.eff: 1.00
83+
B06.type: 1
84+
85+
B07.r: 30.
86+
B07.z: 250
87+
B07.x0: 0.01
88+
B07.xrho: 2.3292e-01
89+
B07.resRPhi: 0.001
90+
B07.resZ: 0.001
91+
B07.eff: 1.00
92+
B07.type: 1
93+
94+
B08.r: 45.
95+
B08.z: 250
96+
B08.x0: 0.01
97+
B08.xrho: 2.3292e-01
98+
B08.resRPhi: 0.001
99+
B08.resZ: 0.001
100+
B08.eff: 1.00
101+
B08.type: 1
102+
103+
B09.r: 60.
104+
B09.z: 250
105+
B09.x0: 0.01
106+
B09.xrho: 2.3292e-01
107+
B09.resRPhi: 0.001
108+
B09.resZ: 0.001
109+
B09.eff: 1.00
110+
B09.type: 1
111+
112+
B10.r: 80.
113+
B10.z: 250
114+
B10.x0: 0.01
115+
B10.xrho: 2.3292e-01
116+
B10.resRPhi: 0.001
117+
B10.resZ: 0.001
118+
B10.eff: 1.00
119+
B10.type: 1

‎ALICE3/Macros/Configuration/a3geometry_v3.ini‎

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
# Format:
2+
# <layer_name>.<parameter>: <value>
3+
# Example:
4+
# layer1.r: 0.5 # radius in cm
5+
# layer1.z: 250 # half-length in cm
6+
# layer1.x0: 0.001 # radiation length
7+
# layer1.xrho: 0 # density in g/cm^2
8+
# layer1.resRPhi: 0.0001 # resolution in R-Phi in cm
9+
# layer1.resZ: 0.0001 # resolution in Z in cm
10+
# layer1.eff: 1.0 # efficiency (0 to 1)
11+
# layer1.type: 1 # type of layer (0: passive, 1: active)
12+
# layer1.deadPhiRegions: /path/to/dead_regions.root # optional dead regions file
13+
14+
bpipe0.r: 0.48
15+
bpipe0.z: 250
16+
bpipe0.x0: 0.001592
17+
bpipe0.xrho: 0
18+
bpipe0.resRPhi: 0.0f
19+
bpipe0.resZ: 0.0f
20+
bpipe0.eff: 0.0f
21+
bpipe0.type: 0
22+
23+
B00.r: 0.5
24+
B00.z: 250
25+
B00.x0: 0.00076
26+
B00.xrho: 0
27+
B00.resRPhi: 0.00025
28+
B00.resZ: 0.00025
29+
B00.eff: 1.00
30+
B00.type: 1
31+
32+
B01.r 1.2
33+
B01.z 250
34+
B01.x0 0.00096
35+
B01.xrho 0
36+
B01.resRPhi 0.00025
37+
B01.resZ 0.00025
38+
B01.eff 1.00
39+
B01.type 1
40+
41+
B02.r: 2.5
42+
B02.z: 250
43+
B02.x0: 0.00167
44+
B02.xrho: 0
45+
B02.resRPhi: 0.00025
46+
B02.resZ: 0.00025
47+
B02.eff: 1.00
48+
B02.type: 1
49+
50+
coldplate.r: 2.6
51+
coldplate.z: 250
52+
coldplate.x0: 0.02f
53+
coldplate.xrho: 0
54+
coldplate.resRPhi: 0.0f
55+
coldplate.resZ: 0.0f
56+
coldplate.eff: 0.0f
57+
coldplate.type: 0
58+
59+
bpipe1.r: 5.7
60+
bpipe1.z: 250
61+
bpipe1.x0: 0.0023f
62+
bpipe1.xrho: 0
63+
bpipe1.resRPhi: 0.0f
64+
bpipe1.resZ: 0.0f
65+
bpipe1.eff: 0.0f
66+
bpipe1.type: 0
67+
68+
B03.r: 7.
69+
B03.z: 250
70+
B03.x0: 0.01
71+
B03.xrho: 2.3292e-01
72+
B03.resRPhi: 0.001
73+
B03.resZ: 0.001
74+
B03.eff: 1.00
75+
B03.type: 1
76+
77+
B04.r: 9.
78+
B04.z: 250
79+
B04.x0: 0.01
80+
B04.xrho: 2.3292e-01
81+
B04.resRPhi: 0.001
82+
B04.resZ: 0.001
83+
B04.eff: 1.00
84+
B04.type: 1
85+
86+
B05.r: 12.
87+
B05.z: 250
88+
B05.x0: 0.01
89+
B05.xrho: 2.3292e-01
90+
B05.resRPhi: 0.001
91+
B05.resZ: 0.001
92+
B05.eff: 1.00
93+
B05.type: 1
94+
95+
iTOF.r: 19
96+
iTOF.z: 250
97+
iTOF.x0: 0.01*3.
98+
iTOF.xrho: 0.03
99+
iTOF.resRPhi: 0.001
100+
iTOF.resZ: 0.001
101+
iTOF.eff: 1.00
102+
iTOF.type: 0
103+
104+
B06.r: 20.
105+
B06.z: 250
106+
B06.x0: 0.01
107+
B06.xrho: 2.3292e-01
108+
B06.resRPhi: 0.001
109+
B06.resZ: 0.001
110+
B06.eff: 1.00
111+
B06.type: 1
112+
113+
B07.r: 30.
114+
B07.z: 250
115+
B07.x0: 0.01
116+
B07.xrho: 2.3292e-01
117+
B07.resRPhi: 0.001
118+
B07.resZ: 0.001
119+
B07.eff: 1.00
120+
B07.type: 1
121+
122+
B08.r: 45.
123+
B08.z: 250
124+
B08.x0: 0.01
125+
B08.xrho: 2.3292e-01
126+
B08.resRPhi: 0.001
127+
B08.resZ: 0.001
128+
B08.eff: 1.00
129+
B08.type: 1
130+
131+
B09.r: 60.
132+
B09.z: 250
133+
B09.x0: 0.01
134+
B09.xrho: 2.3292e-01
135+
B09.resRPhi: 0.001
136+
B09.resZ: 0.001
137+
B09.eff: 1.00
138+
B09.type: 1
139+
140+
B10.r: 80.
141+
B10.z: 250
142+
B10.x0: 0.01
143+
B10.xrho: 2.3292e-01
144+
B10.resRPhi: 0.001
145+
B10.resZ: 0.001
146+
B10.eff: 1.00
147+
B10.type: 1
148+
149+
# Lookup tables
150+
global.lutEl: ccdb:/Users/j/jekarlss/LookUpTables/NoEloss/el
151+
global.lutMu: ccdb:/Users/j/jekarlss/LookUpTables/NoEloss/mu
152+
global.lutPi: ccdb:/Users/j/jekarlss/LookUpTables/NoEloss/pi
153+
global.lutKa: ccdb:/Users/j/jekarlss/LookUpTables/NoEloss/ka
154+
global.lutPr: ccdb:/Users/j/jekarlss/LookUpTables/NoEloss/pr
155+
156+
# in kGauss
157+
global.magneticfield: 20

0 commit comments

Comments
 (0)