Skip to content

Commit c937926

Browse files
prottayCMTprottayCMT
authored
Merge branch 'AliceO2Group:master' into master
2 parents b93d449 + 85504c2 commit c937926

File tree

103 files changed

+8194
-3826
lines changed

Some content is hidden

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

103 files changed

+8194
-3826
lines changed

‎.github/workflows/labeler.yml‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -41,73 +41,73 @@ jobs:
4141
labels = os.environ['labels']
4242
tags = {
4343
"infrastructure": "Infrastructure",
44+
"scripts": "Scripts",
45+
"tools": "Tools",
4446
"common": "Common",
47+
"trigger": "Trigger",
48+
"dpg": "DPG",
49+
"tutorial": "Tutorial",
4550
"alice3": "ALICE3",
4651
"pwgcf": "PWGCF",
4752
"pwgdq": "PWGDQ",
4853
"pwgem": "PWGEM",
4954
"pwghf": "PWGHF",
5055
"pwgje": "PWGJE",
5156
"pwglf": "PWGLF",
57+
"pwgmm": "PWGMM",
5258
"pwgud": "PWGUD",
53-
"dpg": "DPG",
54-
"trigger": "Trigger",
55-
"tutorial": "Tutorial",
5659
}
5760
print(f'PR title: "{title}"')
5861
print(f'PR labels: "{labels}"')
5962
tags_relevant = [tags[label] for label in tags if label in labels.split(",")]
6063
print("Relevant title tags:", ",".join(tags_relevant))
61-
passed = True
62-
prefix_good = ",".join(tags_relevant)
63-
prefix_good = f"[{prefix_good}] "
64-
print(f"Generated prefix: {prefix_good}")
65-
replace_title = 0
66-
title_new = title
64+
prefix_generated = ",".join(tags_relevant)
65+
prefix_generated = f"[{prefix_generated}] "
66+
print(f"Generated prefix: {prefix_generated}")
67+
found_tags = False
68+
title_new = title.strip()
6769
# If there is a prefix which contains a known tag, check it for correct tags, and reformat it if needed.
6870
# If there is a prefix which does not contain any known tag, add the tag prefix.
6971
# If there is no prefix, add the tag prefix.
70-
if match := re.match(r"\[?(\w[\w, /\+-]+)[\]:]+ ", title):
72+
if match := re.match(r" *\[?(\w[\w,/\+\- ]+)[\]: ]+ ", title):
7173
prefix_title = match.group(1)
7274
words_prefix_title = prefix_title.replace(",", " ").replace("/", " ").split()
73-
title_stripped = title[len(match.group()) :]
75+
title_stripped = title[len(match.group()) :].strip()
7476
print(f'PR title prefix: "{prefix_title}" -> tags: {words_prefix_title}')
7577
print(f'Stripped PR title: "{title_stripped}"')
7678
if any(tag in words_prefix_title for tag in tags.values()):
79+
found_tags = True
80+
passed = True
7781
for tag in tags.values():
7882
if tag in tags_relevant and tag not in words_prefix_title:
7983
print(f'::error::Relevant tag "{tag}" not found in the prefix of the PR title.')
8084
passed = False
8185
if tag not in tags_relevant and tag in words_prefix_title:
8286
print(f'::error::Irrelevant tag "{tag}" found in the prefix of the PR title.')
8387
passed = False
84-
# Format a valid prefix.
85-
if passed:
86-
prefix_good = ",".join(w for w in prefix_title.replace(",", " ").split() if w)
87-
prefix_good = f"[{prefix_good}] "
88-
print(f"::notice::Reformatted prefix: {prefix_good}")
89-
if match.group() != prefix_good:
90-
replace_title = 1
91-
title_new = prefix_good + title_stripped
88+
if not passed:
89+
print("::error::Problems were found in the PR title prefix.")
90+
print('::notice::Use the form "tags: title" or "[tags] title".')
91+
sys.exit(1)
92+
# Form a valid title with the existing prefix.
93+
prefix_good = ",".join(w for w in prefix_title.replace(",", " ").split() if w)
94+
prefix_good = f"[{prefix_good}] "
95+
print(f'::notice::Reformatted prefix: "{prefix_good}"')
96+
title_new = prefix_good + title_stripped
9297
else:
9398
print("::warning::No known tags found in the prefix.")
94-
if tags_relevant:
95-
replace_title = 1
96-
title_new = prefix_good + title
99+
title_new = " ".join((*match.group().split(), title_stripped))
97100
else:
98101
print("::warning::No valid prefix found in the PR title.")
99-
if tags_relevant:
100-
replace_title = 1
101-
title_new = prefix_good + title
102-
if not passed:
103-
print("::error::Problems were found in the PR title prefix.")
104-
print('::notice::Use the form "tags: title" or "[tags] title".')
105-
sys.exit(1)
106-
if replace_title:
107-
print("::warning::The PR title prefix with tags needs to be added or adjusted.")
108-
print(f'::warning::New title: "{title_new}".')
102+
if not found_tags and tags_relevant:
103+
title_new = prefix_generated + title_new.strip()
104+
replace_title = 0
105+
if title_new == title:
106+
print("::notice::The PR title is fine.")
109107
else:
110-
print("::notice::The PR title prefix is fine.")
108+
replace_title = 1
109+
print("::warning::The PR title needs to be adjusted.")
110+
print(f'::warning::New title: "{title_new}".')
111111
with open(os.environ["GITHUB_OUTPUT"], "a", encoding="utf-8") as fh:
112112
print(f"replace={replace_title}", file=fh)
113113
print(f"title={title_new}", file=fh)

‎ALICE3/Macros/CMakeLists.txt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
# or submit itself to any jurisdiction.
1111

1212
install(FILES Configuration/a3geo.ini
13-
Configuration/a3geometry_v2.ini
14-
Configuration/a3geometry_v3.ini
15-
Configuration/a3geometry_v4.ini
13+
Configuration/a3geometry_v2_10kG.ini
14+
Configuration/a3geometry_v2_20kG_dipole.ini
15+
Configuration/a3geometry_v2_20kG.ini
16+
Configuration/a3geometry_v3.ini
17+
Configuration/a3geometry_v4.ini
1618
PERMISSIONS GROUP_READ GROUP_EXECUTE OWNER_EXECUTE OWNER_WRITE OWNER_READ WORLD_EXECUTE WORLD_READ
1719
DESTINATION share/alice3/)

ALICE3/Macros/Configuration/a3geometry_v2.ini renamed to ALICE3/Macros/Configuration/a3geometry_v2_10kG.ini

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
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
213

314
bpipe0.r: 0.48
415
bpipe0.z: 250
@@ -9,7 +20,6 @@ bpipe0.resZ: 0.0f
920
bpipe0.eff: 0.0f
1021
bpipe0.type: 0
1122

12-
1323
B00.r: 0.5
1424
B00.z: 250
1525
B00.x0: 0.001
@@ -117,3 +127,13 @@ B10.resRPhi: 0.001
117127
B10.resZ: 0.001
118128
B10.eff: 1.00
119129
B10.type: 1
130+
131+
# Lookup tables
132+
global.lutEl: /cvmfs/alice.cern.ch/el7-x86_64/Packages/HEPscore-CCDB/alice3-lut-v0.0.2-1/ALICE3-FASTSIM-LUT/lutCovm.el.10kG.rmin20.geometry_v2.dat
133+
global.lutMu: /cvmfs/alice.cern.ch/el7-x86_64/Packages/HEPscore-CCDB/alice3-lut-v0.0.2-1/ALICE3-FASTSIM-LUT/lutCovm.mu.10kG.rmin20.geometry_v2.dat
134+
global.lutPi: /cvmfs/alice.cern.ch/el7-x86_64/Packages/HEPscore-CCDB/alice3-lut-v0.0.2-1/ALICE3-FASTSIM-LUT/lutCovm.pi.10kG.rmin20.geometry_v2.dat
135+
global.lutKa: /cvmfs/alice.cern.ch/el7-x86_64/Packages/HEPscore-CCDB/alice3-lut-v0.0.2-1/ALICE3-FASTSIM-LUT/lutCovm.ka.10kG.rmin20.geometry_v2.dat
136+
global.lutPr: /cvmfs/alice.cern.ch/el7-x86_64/Packages/HEPscore-CCDB/alice3-lut-v0.0.2-1/ALICE3-FASTSIM-LUT/lutCovm.pr.10kG.rmin20.geometry_v2.dat
137+
138+
# in kGauss
139+
global.magneticfield: 10

‎ALICE3/Macros/Configuration/a3geometry_v2_20kG.ini‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
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.00042
17+
bpipe0.xrho: 2.772e-02
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.001
26+
B00.xrho: 2.3292e-02
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.001
35+
B01.xrho: 2.3292e-02
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.001
44+
B02.xrho: 2.3292e-02
45+
B02.resRPhi: 0.00025
46+
B02.resZ: 0.00025
47+
B02.eff: 1.00
48+
B02.type: 1
49+
50+
bpipe1.r: 3.7
51+
bpipe1.z: 250
52+
bpipe1.x0: 0.0014
53+
bpipe1.xrho: 9.24e-02
54+
bpipe1.resRPhi: 0.0f
55+
bpipe1.resZ: 0.0f
56+
bpipe1.eff: 0.0f
57+
bpipe1.type: 0
58+
59+
B03.r: 3.75
60+
B03.z: 250
61+
B03.x0: 0.01
62+
B03.xrho: 2.3292e-01
63+
B03.resRPhi: 0.001
64+
B03.resZ: 0.001
65+
B03.eff: 1.00
66+
B03.type: 1
67+
68+
B04.r: 7.
69+
B04.z: 250
70+
B04.x0: 0.01
71+
B04.xrho: 2.3292e-01
72+
B04.resRPhi: 0.001
73+
B04.resZ: 0.001
74+
B04.eff: 1.00
75+
B04.type: 1
76+
77+
B05.r: 12.
78+
B05.z: 250
79+
B05.x0: 0.01
80+
B05.xrho: 2.3292e-01
81+
B05.resRPhi: 0.001
82+
B05.resZ: 0.001
83+
B05.eff: 1.00
84+
B05.type: 1
85+
86+
B06.r: 20.
87+
B06.z: 250
88+
B06.x0: 0.01
89+
B06.xrho: 2.3292e-01
90+
B06.resRPhi: 0.001
91+
B06.resZ: 0.001
92+
B06.eff: 1.00
93+
B06.type: 1
94+
95+
B07.r: 30.
96+
B07.z: 250
97+
B07.x0: 0.01
98+
B07.xrho: 2.3292e-01
99+
B07.resRPhi: 0.001
100+
B07.resZ: 0.001
101+
B07.eff: 1.00
102+
B07.type: 1
103+
104+
B08.r: 45.
105+
B08.z: 250
106+
B08.x0: 0.01
107+
B08.xrho: 2.3292e-01
108+
B08.resRPhi: 0.001
109+
B08.resZ: 0.001
110+
B08.eff: 1.00
111+
B08.type: 1
112+
113+
B09.r: 60.
114+
B09.z: 250
115+
B09.x0: 0.01
116+
B09.xrho: 2.3292e-01
117+
B09.resRPhi: 0.001
118+
B09.resZ: 0.001
119+
B09.eff: 1.00
120+
B09.type: 1
121+
122+
B10.r: 80.
123+
B10.z: 250
124+
B10.x0: 0.01
125+
B10.xrho: 2.3292e-01
126+
B10.resRPhi: 0.001
127+
B10.resZ: 0.001
128+
B10.eff: 1.00
129+
B10.type: 1
130+
131+
# Lookup tables
132+
global.lutEl: /cvmfs/alice.cern.ch/el7-x86_64/Packages/HEPscore-CCDB/alice3-lut-v0.0.2-1/ALICE3-FASTSIM-LUT/lutCovm.el.20kG.rmin20.geometry_v2.dat
133+
global.lutMu: /cvmfs/alice.cern.ch/el7-x86_64/Packages/HEPscore-CCDB/alice3-lut-v0.0.2-1/ALICE3-FASTSIM-LUT/lutCovm.mu.20kG.rmin20.geometry_v2.dat
134+
global.lutPi: /cvmfs/alice.cern.ch/el7-x86_64/Packages/HEPscore-CCDB/alice3-lut-v0.0.2-1/ALICE3-FASTSIM-LUT/lutCovm.pi.20kG.rmin20.geometry_v2.dat
135+
global.lutKa: /cvmfs/alice.cern.ch/el7-x86_64/Packages/HEPscore-CCDB/alice3-lut-v0.0.2-1/ALICE3-FASTSIM-LUT/lutCovm.ka.20kG.rmin20.geometry_v2.dat
136+
global.lutPr: /cvmfs/alice.cern.ch/el7-x86_64/Packages/HEPscore-CCDB/alice3-lut-v0.0.2-1/ALICE3-FASTSIM-LUT/lutCovm.pr.20kG.rmin20.geometry_v2.dat
137+
138+
# in kGauss
139+
global.magneticfield: 20

0 commit comments

Comments
 (0)