remove /scenarios/ and fix uproot.open()

PurdueAF · Jun 28, 2024 · b1e704a · b1e704a
1 parent 9138788
commit b1e704a
Show file tree

Hide file tree

Showing 5 changed files with 163 additions and 279 deletions.
diff --git a/notebooks/2.1_Single-file.ipynb b/notebooks/2.1_Single-file.ipynb
diff --git a/scenarios/common.py b/scenarios/common.py
diff --git a/scenarios/generator_2p1.py b/scenarios/generator_2p1.py
diff --git a/scenarios/utils.py b/scenarios/utils.py
diff --git a/src/uproot_processor.py b/src/uproot_processor.py
@@ -83,15 +83,15 @@ def worker_func(self, args, **kwargs):
         files = args["files"]
         columns = args["columns"]
         for file in files:
+            tree = self.open_nanoaod(file)
             for column in columns:
-                col_stats = self.process_column(file, column, **kwargs)
+                col_stats = self.process_column(tree, column, **kwargs)
                 col_stats_df = pd.concat([col_stats_df, col_stats])
         self.run_worker_operation()
         return col_stats_df
 
 
-    def process_column(self, file, column, **kwargs):
-        tree = self.open_nanoaod(file)
+    def process_column(self, tree, column, **kwargs):
         column_data = tree[column]
         col_stats = pd.DataFrame([{
             "file": tree.file.file_path,