Skip to content

Commit 9f220bd

Browse files
authored
Extend drawable particles (#90)
* Add also O2DPG to jdl * Add other drawable particles
1 parent c2aaab4 commit 9f220bd

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

examples/scripts/grid/make_grid_files.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ def main(jdl_file,
2323
configuration_file,
2424
config_tag,
2525
delphes_version,
26+
o2dpg_version,
2627
make_alien_directory):
2728
"""
2829
Function to create the working environment for GRID job submission
@@ -48,7 +49,8 @@ def write_line(line):
4849
f"--ev {number_of_events} -e {config_tag} -l -v --no-vertexing\";\n")
4950
write_line("Requirements = ( other.Type == \"machine\" );\n")
5051
write_line("Packages = {")
51-
write_line(f"\t\"VO_ALICE@{delphes_version}\"")
52+
write_line(f"\t\"VO_ALICE@{delphes_version}\",")
53+
write_line(f"\t\"VO_ALICE@{o2dpg_version}\"")
5254
write_line("};\n")
5355
write_line("JDLVariables = {")
5456
write_line("\t\"Packages\",")
@@ -124,6 +126,9 @@ def write_line(line):
124126
parser.add_argument("--delphes_version", "--delphes",
125127
type=str, default="DelphesO2::v20210409-1",
126128
help="Version of DelphesO2 to use")
129+
parser.add_argument("--o2dpg_version", "--o2dpg",
130+
type=str, default="O2DPG::prod-202104-27-1",
131+
help="Version of O2DPG to use")
127132
parser.add_argument("--no-vertexing",
128133
action="store_true",
129134
help="Option turning off the vertexing.")
@@ -141,4 +146,5 @@ def write_line(line):
141146
config_tag=args.entry,
142147
njobs=args.njobs,
143148
delphes_version=args.delphes_version,
149+
o2dpg_version=args.o2dpg_version,
144150
make_alien_directory=args.make_alien_dir)

examples/smearing/draw.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ def main(reader_name,
3939

4040
style()
4141

42-
p = {"el": "e", "pi": "#pi", "ka": "K", "pr": "p"}
42+
p = {"el": "e", "pi": "#pi", "ka": "K", "pr": "p", "de": "d", "he3": "^{3}He"}
4343
p_colors = {"el": "#e41a1c", "pi": "#377eb8",
44-
"ka": "#4daf4a", "pr": "#984ea3"}
44+
"ka": "#4daf4a", "pr": "#984ea3",
45+
"de": "#ff7f00", "he3": "#a65628"}
4546
if particles is not None:
4647
to_remove = []
4748
for i in p:
@@ -119,7 +120,7 @@ def draw_alice3_label(x=0.5, y=0.9):
119120
return
120121
g = reader(lut, eta)
121122
if g.GetN() <= 0:
122-
print("Skipping", g.GetName())
123+
print("Skipping", g.GetName(), "because empty graph")
123124
continue
124125
if len(g_list) == 0:
125126
frame.GetXaxis().SetTitle(g.GetXaxis().GetTitle())

0 commit comments

Comments
 (0)