[tree] Double32/Float16 avoid overwriting title from base class since it contains leafcounter #18829

ferdymercury · 2025-05-21T15:27:44Z

This Pull request:

Changes or fixes:

Fixes https://its.cern.ch/jira/browse/ROOT-10149

fyi @Triple-S

Context: 5b2bc09#diff-cb6d6533f05ffb9510627ac9d183f78821be4214f1b640ae050d4bac271c1daaR50 from #3463

Checklist:

tested changes locally
updated the docs (if necessary)

tree/tree/src/TLeaf.cxx

tree/tree/src/TLeafD32.cxx

tree/tree/test/TTreeTruncatedDatatypes.cxx

tree/tree/src/TLeafD32.cxx

tree/tree/src/TLeafF16.cxx

tree/tree/src/TLeafD32.cxx

tree/tree/src/TLeafF16.cxx

tree/tree/src/TLeafD32.cxx

tree/tree/test/TTreeTruncatedDatatypes.cxx

github-actions · 2025-05-21T23:42:39Z

Test Results

18 files 18 suites 3d 5h 1m 48s ⏱️
2 811 tests 2 811 ✅ 0 💤 0 ❌
49 162 runs 49 162 ✅ 0 💤 0 ❌

Results for commit cb292ad.

♻️ This comment has been updated with latest results.

tree/tree/test/TTreeTruncatedDatatypes.cxx

tree/tree/src/TLeafF16.cxx

tree/tree/src/TLeafD32.cxx

tree/tree/src/TLeafF16.cxx

with truncated data types, where name != title in TLeaf / TNamed

as suggested by pcanal

[tree] append only bracket custom part, skip data type [tree] fix streamer

as suggested by pcanal

to easen debug

tree/tree/test/TTreeTruncatedDatatypes.cxx

ferdymercury · 2025-05-25T15:19:43Z

Test is passing now.

…ength

tree/tree/inc/TLeafD32.h

tree/treeplayer/src/TTreeFormula.cxx

Co-authored-by: Philippe Canal <[email protected]>

pcanal reviewed May 21, 2025

View reviewed changes

tree/tree/src/TLeaf.cxx Show resolved Hide resolved

pcanal reviewed May 21, 2025

View reviewed changes

tree/tree/src/TLeaf.cxx Outdated Show resolved Hide resolved

pcanal reviewed May 21, 2025

View reviewed changes

tree/tree/src/TLeafD32.cxx Outdated Show resolved Hide resolved

pcanal reviewed May 21, 2025

View reviewed changes

tree/tree/src/TLeafD32.cxx Outdated Show resolved Hide resolved

ferdymercury changed the title ~~[tree] get leaf name, not title, since title is reused to store truncated double limits~~ [tree] do not overwrite title since it is reused to store truncated double limits May 21, 2025

pcanal reviewed May 21, 2025

View reviewed changes

tree/tree/src/TLeafD32.cxx Show resolved Hide resolved

pcanal reviewed May 21, 2025

View reviewed changes

tree/tree/src/TLeafD32.cxx Outdated Show resolved Hide resolved

pcanal reviewed May 21, 2025

View reviewed changes

tree/tree/src/TLeafD32.cxx Show resolved Hide resolved

pcanal reviewed May 21, 2025

View reviewed changes

tree/tree/src/TLeafD32.cxx Outdated Show resolved Hide resolved

pcanal reviewed May 21, 2025

View reviewed changes

tree/tree/test/TTreeTruncatedDatatypes.cxx Outdated Show resolved Hide resolved

ferdymercury changed the title ~~[tree] do not overwrite title since it is reused to store truncated double limits~~ [tree] do not overwrite title since it must also contain leafcounter May 21, 2025

ferdymercury commented May 21, 2025

View reviewed changes

tree/tree/src/TLeafD32.cxx Outdated Show resolved Hide resolved

ferdymercury commented May 21, 2025

View reviewed changes

tree/tree/src/TLeafF16.cxx Outdated Show resolved Hide resolved

ferdymercury commented May 21, 2025

View reviewed changes

tree/tree/src/TLeafD32.cxx Outdated Show resolved Hide resolved

ferdymercury commented May 21, 2025

View reviewed changes

tree/tree/src/TLeafF16.cxx Outdated Show resolved Hide resolved

pcanal reviewed May 21, 2025

View reviewed changes

tree/tree/src/TLeafD32.cxx Outdated Show resolved Hide resolved

pcanal reviewed May 21, 2025

View reviewed changes

tree/tree/src/TLeafD32.cxx Outdated Show resolved Hide resolved

pcanal reviewed May 21, 2025

View reviewed changes

tree/tree/test/TTreeTruncatedDatatypes.cxx Outdated Show resolved Hide resolved

ferdymercury commented May 22, 2025

View reviewed changes

tree/tree/test/TTreeTruncatedDatatypes.cxx Outdated Show resolved Hide resolved

ferdymercury commented May 22, 2025

View reviewed changes

tree/tree/test/TTreeTruncatedDatatypes.cxx Outdated Show resolved Hide resolved

ferdymercury commented May 22, 2025

View reviewed changes

tree/tree/test/TTreeTruncatedDatatypes.cxx Outdated Show resolved Hide resolved

ferdymercury force-pushed the patch-3 branch from 2c3e81c to 4bb6c9c Compare May 22, 2025 08:40

ferdymercury commented May 22, 2025

View reviewed changes

tree/tree/src/TLeafF16.cxx Outdated Show resolved Hide resolved

ferdymercury commented May 22, 2025

View reviewed changes

tree/tree/src/TLeafD32.cxx Outdated Show resolved Hide resolved

ferdymercury force-pushed the patch-3 branch from e62abd0 to d3a3bc1 Compare May 22, 2025 08:52

pcanal reviewed May 22, 2025

View reviewed changes

tree/tree/src/TLeafF16.cxx Outdated Show resolved Hide resolved

pcanal reviewed May 22, 2025

View reviewed changes

tree/tree/src/TLeafF16.cxx Outdated Show resolved Hide resolved

ferdymercury added this to the 6.38.00 milestone May 22, 2025

ferdymercury changed the title ~~[tree] do not overwrite title since it must also contain leafcounter~~ [tree] Double32/Float16 do not overwrite title since it must also contain leafcounter May 23, 2025

ferdymercury force-pushed the patch-3 branch from 67d58e5 to 0852516 Compare May 25, 2025 11:55

ferdymercury added 12 commits May 25, 2025 14:00

[test] add test for GetLeafCounter

abc3dff

with truncated data types, where name != title in TLeaf / TNamed

[tree] Do not overwrite title, since it's used by GetLeafCounter

af16257

[test] roundtrip with file

74ef364

as suggested by pcanal

[tree] make check more robust

a3c4695

[tree] append only bracket custom part, skip data type [tree] fix streamer

[test] Update with more branches

82a13ab

as suggested by pcanal

[tree] bump class version and customize streamer

726c9c1

[tree] customize counter function to search for truncated suffix

e81ed42

[tree] prevent potential memleak

ef3d498

[tree] full type in title, only bracket in fElement

2df10a6

[tree] avoid temporary

a3721c2

[test] fill tree and check values

28c123b

as suggested by pcanal

[test] reduce nEntries

Loading
Loading status checks…

9a9c10e

to easen debug

ferdymercury force-pushed the patch-3 branch from 0852516 to 9a9c10e Compare May 25, 2025 12:00

ferdymercury commented May 25, 2025

View reviewed changes

tree/tree/test/TTreeTruncatedDatatypes.cxx Outdated Show resolved Hide resolved

ferdymercury added 2 commits May 25, 2025 16:20

[test] adjust truncation

Loading
Loading status checks…

e7eab84

[test] adjust tolerance

Loading
Loading status checks…

a31d6f7

ferdymercury requested a review from pcanal May 25, 2025 15:19

ferdymercury marked this pull request as ready for review May 25, 2025 15:19

ferdymercury added 2 commits May 25, 2025 18:08

[test] try with n=0

Loading
Loading status checks…

9e0f9eb

[nfc] improve TTree docu of custom-truncated arrays of fixed or var l…

Loading
Loading status checks…

dcaf000

…ength

bellenot assigned pcanal May 26, 2025

[tree] do not look for dimensions in custom suffix of truncated leafs

Loading
Loading status checks…

1d4e8be

pcanal reviewed Jun 11, 2025

View reviewed changes

tree/tree/inc/TLeafD32.h Show resolved Hide resolved

pcanal reviewed Jun 11, 2025

View reviewed changes

tree/treeplayer/src/TTreeFormula.cxx Outdated Show resolved Hide resolved

[nfc] fix backslash typo in docu

Loading
Loading status checks…

cb292ad

Co-authored-by: Philippe Canal <[email protected]>

pcanal approved these changes Jun 11, 2025

View reviewed changes

pcanal merged commit da232dd into root-project:master Jun 13, 2025
22 of 24 checks passed

ferdymercury deleted the patch-3 branch June 13, 2025 18:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[tree] Double32/Float16 avoid overwriting title from base class since it contains leafcounter #18829

[tree] Double32/Float16 avoid overwriting title from base class since it contains leafcounter #18829

ferdymercury commented May 21, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented May 21, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ferdymercury commented May 25, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

[tree] Double32/Float16 avoid overwriting title from base class since it contains leafcounter #18829

[tree] Double32/Float16 avoid overwriting title from base class since it contains leafcounter #18829

Conversation

ferdymercury commented May 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

This Pull request:

Changes or fixes:

Checklist:

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented May 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ferdymercury commented May 25, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ferdymercury commented May 21, 2025 •

edited

Loading

github-actions bot commented May 21, 2025 •

edited

Loading