From 0a5e2a9e5beae6ac4f3d1079b1b9f258e80b59da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Jacazio?= Date: Wed, 28 Apr 2021 16:50:41 +0200 Subject: [PATCH 1/2] Add also O2DPG to jdl --- examples/scripts/grid/make_grid_files.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/examples/scripts/grid/make_grid_files.py b/examples/scripts/grid/make_grid_files.py index 1a40eaf..41a6b68 100755 --- a/examples/scripts/grid/make_grid_files.py +++ b/examples/scripts/grid/make_grid_files.py @@ -23,6 +23,7 @@ def main(jdl_file, configuration_file, config_tag, delphes_version, + o2dpg_version, make_alien_directory): """ Function to create the working environment for GRID job submission @@ -48,7 +49,8 @@ def write_line(line): f"--ev {number_of_events} -e {config_tag} -l -v --no-vertexing\";\n") write_line("Requirements = ( other.Type == \"machine\" );\n") write_line("Packages = {") - write_line(f"\t\"VO_ALICE@{delphes_version}\"") + write_line(f"\t\"VO_ALICE@{delphes_version}\",") + write_line(f"\t\"VO_ALICE@{o2dpg_version}\"") write_line("};\n") write_line("JDLVariables = {") write_line("\t\"Packages\",") @@ -124,6 +126,9 @@ def write_line(line): parser.add_argument("--delphes_version", "--delphes", type=str, default="DelphesO2::v20210409-1", help="Version of DelphesO2 to use") + parser.add_argument("--o2dpg_version", "--o2dpg", + type=str, default="O2DPG::prod-202104-27-1", + help="Version of O2DPG to use") parser.add_argument("--no-vertexing", action="store_true", help="Option turning off the vertexing.") @@ -141,4 +146,5 @@ def write_line(line): config_tag=args.entry, njobs=args.njobs, delphes_version=args.delphes_version, + o2dpg_version=args.o2dpg_version, make_alien_directory=args.make_alien_dir) From 1f3e59b60a3f15bc79885f6c31e6eda6d770bd1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Jacazio?= Date: Wed, 30 Jun 2021 20:21:01 +0200 Subject: [PATCH 2/2] Add other drawable particles --- examples/smearing/draw.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/smearing/draw.py b/examples/smearing/draw.py index baa080e..0328f25 100755 --- a/examples/smearing/draw.py +++ b/examples/smearing/draw.py @@ -39,9 +39,10 @@ def main(reader_name, style() - p = {"el": "e", "pi": "#pi", "ka": "K", "pr": "p"} + p = {"el": "e", "pi": "#pi", "ka": "K", "pr": "p", "de": "d", "he3": "^{3}He"} p_colors = {"el": "#e41a1c", "pi": "#377eb8", - "ka": "#4daf4a", "pr": "#984ea3"} + "ka": "#4daf4a", "pr": "#984ea3", + "de": "#ff7f00", "he3": "#a65628"} if particles is not None: to_remove = [] for i in p: @@ -119,7 +120,7 @@ def draw_alice3_label(x=0.5, y=0.9): return g = reader(lut, eta) if g.GetN() <= 0: - print("Skipping", g.GetName()) + print("Skipping", g.GetName(), "because empty graph") continue if len(g_list) == 0: frame.GetXaxis().SetTitle(g.GetXaxis().GetTitle())