From 505e53ddcd4fce9d6ef31302ac47615d3e5cee30 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 11 Apr 2024 23:15:03 -0400 Subject: [PATCH 01/13] Fix ecal_gaps benchmark --- benchmarks/ecal_gaps/ecal_gaps.org | 2 ++ 1 file changed, 2 insertions(+) diff --git a/benchmarks/ecal_gaps/ecal_gaps.org b/benchmarks/ecal_gaps/ecal_gaps.org index 23bd4737..8bdcac22 100644 --- a/benchmarks/ecal_gaps/ecal_gaps.org +++ b/benchmarks/ecal_gaps/ecal_gaps.org @@ -76,6 +76,8 @@ def get_events(particle="e-", energy="20GeV", num_files=1): filter_name=filter_name, open_files=False, steps_per_file=1, ) + print(events.fields) + pt = np.hypot(events["MCParticles.momentum.x"][:,0], events["MCParticles.momentum.y"][:,0]) theta = np.arctan2(pt, events["MCParticles.momentum.z"][:,0]) eta = -np.log(np.tan(theta / 2)) From 1a03196cdc347d7e5142302e1fd4231d63448ce4 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 12 Apr 2024 13:48:22 -0400 Subject: [PATCH 02/13] recursive=True --- benchmarks/ecal_gaps/ecal_gaps.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/ecal_gaps/ecal_gaps.org b/benchmarks/ecal_gaps/ecal_gaps.org index 8bdcac22..4b50888b 100644 --- a/benchmarks/ecal_gaps/ecal_gaps.org +++ b/benchmarks/ecal_gaps/ecal_gaps.org @@ -73,7 +73,7 @@ def get_events(particle="e-", energy="20GeV", num_files=1): | {f"sim_output/{DETECTOR_CONFIG}/{particle}/{energy}/45to135deg/{particle}_{energy}_45to135deg.{INDEX:04d}.eicrecon.tree.edm4eic.root": "events" for INDEX in range(num_files)} | {f"sim_output/{DETECTOR_CONFIG}/{particle}/{energy}/130to177deg/{particle}_{energy}_130to177deg.{INDEX:04d}.eicrecon.tree.edm4eic.root": "events" for INDEX in range(num_files)} , - filter_name=filter_name, open_files=False, steps_per_file=1, + filter_name=filter_name, open_files=False, steps_per_file=1, recursive=True, ) print(events.fields) From f2147334450e6b08b3be688a24e4d0ce62f21ad1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 12 Apr 2024 13:51:45 -0400 Subject: [PATCH 03/13] pin uproot --- benchmarks/ecal_gaps/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/ecal_gaps/requirements.txt b/benchmarks/ecal_gaps/requirements.txt index 738152dd..dc376fe2 100644 --- a/benchmarks/ecal_gaps/requirements.txt +++ b/benchmarks/ecal_gaps/requirements.txt @@ -4,4 +4,4 @@ dask_awkward dask_histogram distributed >= 2023 pyhepmc -uproot >= 5.2.0 +uproot ~= 5.2.0 From 1d3d07390295ee195661280f758610eb76df4221 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 12 Apr 2024 15:36:51 -0400 Subject: [PATCH 04/13] Revert "pin uproot" This reverts commit f2147334450e6b08b3be688a24e4d0ce62f21ad1. --- benchmarks/ecal_gaps/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/ecal_gaps/requirements.txt b/benchmarks/ecal_gaps/requirements.txt index dc376fe2..738152dd 100644 --- a/benchmarks/ecal_gaps/requirements.txt +++ b/benchmarks/ecal_gaps/requirements.txt @@ -4,4 +4,4 @@ dask_awkward dask_histogram distributed >= 2023 pyhepmc -uproot ~= 5.2.0 +uproot >= 5.2.0 From 8285448aab7105f73d2f742905ab3c55061c3b78 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 12 Apr 2024 15:39:32 -0400 Subject: [PATCH 05/13] Revert "recursive=True" This reverts commit 1a03196cdc347d7e5142302e1fd4231d63448ce4. --- benchmarks/ecal_gaps/ecal_gaps.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/ecal_gaps/ecal_gaps.org b/benchmarks/ecal_gaps/ecal_gaps.org index 4b50888b..8bdcac22 100644 --- a/benchmarks/ecal_gaps/ecal_gaps.org +++ b/benchmarks/ecal_gaps/ecal_gaps.org @@ -73,7 +73,7 @@ def get_events(particle="e-", energy="20GeV", num_files=1): | {f"sim_output/{DETECTOR_CONFIG}/{particle}/{energy}/45to135deg/{particle}_{energy}_45to135deg.{INDEX:04d}.eicrecon.tree.edm4eic.root": "events" for INDEX in range(num_files)} | {f"sim_output/{DETECTOR_CONFIG}/{particle}/{energy}/130to177deg/{particle}_{energy}_130to177deg.{INDEX:04d}.eicrecon.tree.edm4eic.root": "events" for INDEX in range(num_files)} , - filter_name=filter_name, open_files=False, steps_per_file=1, recursive=True, + filter_name=filter_name, open_files=False, steps_per_file=1, ) print(events.fields) From 1431c10b03fc5c16d559988dc0d6bafd18c50efe Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 12 Apr 2024 15:39:56 -0400 Subject: [PATCH 06/13] ignore_duplicates=True --- benchmarks/ecal_gaps/ecal_gaps.org | 1 + 1 file changed, 1 insertion(+) diff --git a/benchmarks/ecal_gaps/ecal_gaps.org b/benchmarks/ecal_gaps/ecal_gaps.org index 8bdcac22..3c060fb4 100644 --- a/benchmarks/ecal_gaps/ecal_gaps.org +++ b/benchmarks/ecal_gaps/ecal_gaps.org @@ -74,6 +74,7 @@ def get_events(particle="e-", energy="20GeV", num_files=1): | {f"sim_output/{DETECTOR_CONFIG}/{particle}/{energy}/130to177deg/{particle}_{energy}_130to177deg.{INDEX:04d}.eicrecon.tree.edm4eic.root": "events" for INDEX in range(num_files)} , filter_name=filter_name, open_files=False, steps_per_file=1, + ignore_duplicates=True, # workaround a regression from https://github.com/scikit-hep/uproot5/pull/1189 ) print(events.fields) From 0dcc2e0dd1ac34776885ce4d62e2b0c3d11f5357 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 12 Apr 2024 16:51:45 -0400 Subject: [PATCH 07/13] ignore_duplicates=False --- benchmarks/ecal_gaps/ecal_gaps.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/ecal_gaps/ecal_gaps.org b/benchmarks/ecal_gaps/ecal_gaps.org index 3c060fb4..5518828a 100644 --- a/benchmarks/ecal_gaps/ecal_gaps.org +++ b/benchmarks/ecal_gaps/ecal_gaps.org @@ -74,7 +74,7 @@ def get_events(particle="e-", energy="20GeV", num_files=1): | {f"sim_output/{DETECTOR_CONFIG}/{particle}/{energy}/130to177deg/{particle}_{energy}_130to177deg.{INDEX:04d}.eicrecon.tree.edm4eic.root": "events" for INDEX in range(num_files)} , filter_name=filter_name, open_files=False, steps_per_file=1, - ignore_duplicates=True, # workaround a regression from https://github.com/scikit-hep/uproot5/pull/1189 + ignore_duplicates=False, # workaround a regression from https://github.com/scikit-hep/uproot5/pull/1189 ) print(events.fields) From aa0799cfcadaef0b26771e6d864b6abc9421f793 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 13 Apr 2024 18:43:13 -0400 Subject: [PATCH 08/13] Revert "ignore_duplicates=False" This reverts commit 0dcc2e0dd1ac34776885ce4d62e2b0c3d11f5357. --- benchmarks/ecal_gaps/ecal_gaps.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/ecal_gaps/ecal_gaps.org b/benchmarks/ecal_gaps/ecal_gaps.org index 5518828a..3c060fb4 100644 --- a/benchmarks/ecal_gaps/ecal_gaps.org +++ b/benchmarks/ecal_gaps/ecal_gaps.org @@ -74,7 +74,7 @@ def get_events(particle="e-", energy="20GeV", num_files=1): | {f"sim_output/{DETECTOR_CONFIG}/{particle}/{energy}/130to177deg/{particle}_{energy}_130to177deg.{INDEX:04d}.eicrecon.tree.edm4eic.root": "events" for INDEX in range(num_files)} , filter_name=filter_name, open_files=False, steps_per_file=1, - ignore_duplicates=False, # workaround a regression from https://github.com/scikit-hep/uproot5/pull/1189 + ignore_duplicates=True, # workaround a regression from https://github.com/scikit-hep/uproot5/pull/1189 ) print(events.fields) From 8f7c52a3797be6d9b047eccb33786849dd81b703 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 13 Apr 2024 18:43:15 -0400 Subject: [PATCH 09/13] Revert "ignore_duplicates=True" This reverts commit 1431c10b03fc5c16d559988dc0d6bafd18c50efe. --- benchmarks/ecal_gaps/ecal_gaps.org | 1 - 1 file changed, 1 deletion(-) diff --git a/benchmarks/ecal_gaps/ecal_gaps.org b/benchmarks/ecal_gaps/ecal_gaps.org index 3c060fb4..8bdcac22 100644 --- a/benchmarks/ecal_gaps/ecal_gaps.org +++ b/benchmarks/ecal_gaps/ecal_gaps.org @@ -74,7 +74,6 @@ def get_events(particle="e-", energy="20GeV", num_files=1): | {f"sim_output/{DETECTOR_CONFIG}/{particle}/{energy}/130to177deg/{particle}_{energy}_130to177deg.{INDEX:04d}.eicrecon.tree.edm4eic.root": "events" for INDEX in range(num_files)} , filter_name=filter_name, open_files=False, steps_per_file=1, - ignore_duplicates=True, # workaround a regression from https://github.com/scikit-hep/uproot5/pull/1189 ) print(events.fields) From 936a52d27539e3369e2ebe0d01df201293089006 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 13 Apr 2024 18:43:15 -0400 Subject: [PATCH 10/13] Revert "Revert "recursive=True"" This reverts commit 8285448aab7105f73d2f742905ab3c55061c3b78. --- benchmarks/ecal_gaps/ecal_gaps.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/ecal_gaps/ecal_gaps.org b/benchmarks/ecal_gaps/ecal_gaps.org index 8bdcac22..4b50888b 100644 --- a/benchmarks/ecal_gaps/ecal_gaps.org +++ b/benchmarks/ecal_gaps/ecal_gaps.org @@ -73,7 +73,7 @@ def get_events(particle="e-", energy="20GeV", num_files=1): | {f"sim_output/{DETECTOR_CONFIG}/{particle}/{energy}/45to135deg/{particle}_{energy}_45to135deg.{INDEX:04d}.eicrecon.tree.edm4eic.root": "events" for INDEX in range(num_files)} | {f"sim_output/{DETECTOR_CONFIG}/{particle}/{energy}/130to177deg/{particle}_{energy}_130to177deg.{INDEX:04d}.eicrecon.tree.edm4eic.root": "events" for INDEX in range(num_files)} , - filter_name=filter_name, open_files=False, steps_per_file=1, + filter_name=filter_name, open_files=False, steps_per_file=1, recursive=True, ) print(events.fields) From 33e6a21b4a964f04da4735d2208238af4e9ce6ef Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 13 Apr 2024 21:43:34 -0400 Subject: [PATCH 11/13] Revert "Revert "Revert "recursive=True""" This reverts commit 936a52d27539e3369e2ebe0d01df201293089006. --- benchmarks/ecal_gaps/ecal_gaps.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/ecal_gaps/ecal_gaps.org b/benchmarks/ecal_gaps/ecal_gaps.org index 4b50888b..8bdcac22 100644 --- a/benchmarks/ecal_gaps/ecal_gaps.org +++ b/benchmarks/ecal_gaps/ecal_gaps.org @@ -73,7 +73,7 @@ def get_events(particle="e-", energy="20GeV", num_files=1): | {f"sim_output/{DETECTOR_CONFIG}/{particle}/{energy}/45to135deg/{particle}_{energy}_45to135deg.{INDEX:04d}.eicrecon.tree.edm4eic.root": "events" for INDEX in range(num_files)} | {f"sim_output/{DETECTOR_CONFIG}/{particle}/{energy}/130to177deg/{particle}_{energy}_130to177deg.{INDEX:04d}.eicrecon.tree.edm4eic.root": "events" for INDEX in range(num_files)} , - filter_name=filter_name, open_files=False, steps_per_file=1, recursive=True, + filter_name=filter_name, open_files=False, steps_per_file=1, ) print(events.fields) From 3953acb5c8905bc715a8ba9af931a8ecb4ce61c4 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 13 Apr 2024 21:43:43 -0400 Subject: [PATCH 12/13] Revert "Revert "pin uproot"" This reverts commit 1d3d07390295ee195661280f758610eb76df4221. --- benchmarks/ecal_gaps/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/ecal_gaps/requirements.txt b/benchmarks/ecal_gaps/requirements.txt index 738152dd..dc376fe2 100644 --- a/benchmarks/ecal_gaps/requirements.txt +++ b/benchmarks/ecal_gaps/requirements.txt @@ -4,4 +4,4 @@ dask_awkward dask_histogram distributed >= 2023 pyhepmc -uproot >= 5.2.0 +uproot ~= 5.2.0 From 2542d242d594a9fe035c21a8c37fbcaf742f472e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 13 Apr 2024 22:02:50 -0400 Subject: [PATCH 13/13] Revert "Fix ecal_gaps benchmark" This reverts commit 505e53ddcd4fce9d6ef31302ac47615d3e5cee30. --- benchmarks/ecal_gaps/ecal_gaps.org | 2 -- 1 file changed, 2 deletions(-) diff --git a/benchmarks/ecal_gaps/ecal_gaps.org b/benchmarks/ecal_gaps/ecal_gaps.org index 8bdcac22..23bd4737 100644 --- a/benchmarks/ecal_gaps/ecal_gaps.org +++ b/benchmarks/ecal_gaps/ecal_gaps.org @@ -76,8 +76,6 @@ def get_events(particle="e-", energy="20GeV", num_files=1): filter_name=filter_name, open_files=False, steps_per_file=1, ) - print(events.fields) - pt = np.hypot(events["MCParticles.momentum.x"][:,0], events["MCParticles.momentum.y"][:,0]) theta = np.arctan2(pt, events["MCParticles.momentum.z"][:,0]) eta = -np.log(np.tan(theta / 2))