Skip to content

Commit fdcbd23

Browse files
committed
Remove spaces between brackes in class names when TBranch matches streamer
1 parent fcb1333 commit fdcbd23

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

src/uproot/behaviors/TBranch.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2449,6 +2449,9 @@ def streamer(self):
24492449
fParentName = self.member("fParentName", none_if_missing=True)
24502450
fClassName = self.member("fClassName", none_if_missing=True)
24512451

2452+
fParentName = fParentName.replace(" ", "") if fParentName else None
2453+
fClassName = fClassName.replace(" ", "") if fClassName else None
2454+
24522455
if fParentName is not None and fParentName != "":
24532456
matches = self._file.streamers.get(fParentName)
24542457

@@ -2481,19 +2484,21 @@ def streamer(self):
24812484
break
24822485
break
24832486

2484-
if (
2485-
self.parent.member("fClassName") == "TClonesArray"
2486-
or self.parent.member("fClonesName", none_if_missing=True)
2487-
== fParentName
2488-
):
2487+
if self.parent.member(
2488+
"fClassName"
2489+
) == "TClonesArray" or self.parent.member(
2490+
"fClonesName", none_if_missing=True
2491+
) == self.member(
2492+
"fParentName"
2493+
): # Use `self.member("fParentName")` since `fClassName` could contain spaces between brackets.
24892494
self._streamer_isTClonesArray = True
24902495

24912496
elif fClassName is not None and fClassName != "":
24922497
if fClassName == "TClonesArray":
24932498
self._streamer_isTClonesArray = True
2494-
matches = self._file.streamers.get(
2495-
self.member("fClonesName", none_if_missing=True)
2496-
)
2499+
fClonesName = self.member("fClonesName", none_if_missing=True)
2500+
fClonesName = fClonesName.replace(" ", "") if fClonesName else None
2501+
matches = self._file.streamers.get(fClonesName)
24972502
else:
24982503
matches = self._file.streamers.get(fClassName)
24992504

0 commit comments

Comments
 (0)