fix: apply TBranch.array's veto of AsGrouped from 'ranges_or_baskets'…

… to HasBranches.arrays and HasBranches.iterate
scikit-hep · Aug 12, 2024 · fce7e94 · fce7e94
1 parent 80e7803
commit fce7e94
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/uproot/behaviors/TBranch.py b/src/uproot/behaviors/TBranch.py
@@ -811,7 +811,10 @@ def get_from_cache(branchname, interpretation):
         checked = set()
         for _, context in expression_context:
             for branch in context["branches"]:
-                if branch.cache_key not in checked:
+                if branch.cache_key not in checked and not isinstance(
+                    branchid_interpretation[branch.cache_key],
+                    uproot.interpretation.grouped.AsGrouped,
+                ):
                     checked.add(branch.cache_key)
                     for (
                         basket_num,
@@ -1035,7 +1038,10 @@ def iterate(
                 checked = set()
                 for _, context in expression_context:
                     for branch in context["branches"]:
-                        if branch.cache_key not in checked:
+                        if branch.cache_key not in checked and not isinstance(
+                            branchid_interpretation[branch.cache_key],
+                            uproot.interpretation.grouped.AsGrouped,
+                        ):
                             checked.add(branch.cache_key)
                             for (
                                 basket_num,