Skip to content

Commit

Permalink
Adapt to TStreamerInfo version inc to 10
Browse files Browse the repository at this point in the history
  • Loading branch information
@pcanal
pcanal committed Nov 26, 2024
1 parent c0c11c6 commit 556a7c8
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 88 deletions.
2 changes: 1 addition & 1 deletion root/io/filemerger/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ if(${compression_default} STREQUAL "zlib")

ROOTTEST_ADD_TEST(simple-zlib-compr-level1
PRECMD ${ROOT_hadd_CMD} -f101 hsimple101.root hsimple.root
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple101.root\",25000,101,414984,25)"
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple101.root\",25000,101,415025,25)"
DEPENDS roottest-root-io-filemerger-hsimple)

ROOTTEST_ADD_TEST(simple-zlib-compr-level6
Expand Down
84 changes: 42 additions & 42 deletions root/tree/cache/autocacheZLIB.ref
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,14 @@ Reported cache size from chain: 0
Chain reports 200 entries
Getting last entry from first file in chain
Reported AutoFlush from current tree: 50
Reported cache size from chain: 1435418
Reported cache size from current tree: 1435418
Reported buffer size from TTreeCache: 1435418
Reported cache size from chain: 1435581
Reported cache size from current tree: 1435581
Reported buffer size from TTreeCache: 1435581
Getting first entry from second file in chain
Reported AutoFlush from current tree: 57
Reported cache size from chain: 1435418
Reported cache size from current tree: 1435418
Reported buffer size from TTreeCache: 1435418
Reported cache size from chain: 1435581
Reported cache size from current tree: 1435581
Reported buffer size from TTreeCache: 1435581
TTreeCache object pointer stayed the same

--- Start of subtest 13
Expand All @@ -222,14 +222,14 @@ Reported cache size from chain: -1
Chain reports 200 entries
Getting last entry from first file in chain
Reported AutoFlush from current tree: 50
Reported cache size from chain: 1435418
Reported cache size from current tree: 1435418
Reported buffer size from TTreeCache: 1435418
Reported cache size from chain: 1435581
Reported cache size from current tree: 1435581
Reported buffer size from TTreeCache: 1435581
Getting first entry from second file in chain
Reported AutoFlush from current tree: 57
Reported cache size from chain: 1435418
Reported cache size from current tree: 1435418
Reported buffer size from TTreeCache: 1435418
Reported cache size from chain: 1435581
Reported cache size from current tree: 1435581
Reported buffer size from TTreeCache: 1435581
TTreeCache object pointer stayed the same

* Writing two root files, second with AutoFlush 1.3 times the first
Expand All @@ -240,14 +240,14 @@ Reported cache size from chain: 0
Chain reports 200 entries
Getting last entry from first file in chain
Reported AutoFlush from current tree: 50
Reported cache size from chain: 1435418
Reported cache size from current tree: 1435418
Reported buffer size from TTreeCache: 1435418
Reported cache size from chain: 1435581
Reported cache size from current tree: 1435581
Reported buffer size from TTreeCache: 1435581
Getting first entry from second file in chain
Reported AutoFlush from current tree: 65
Reported cache size from chain: 1866043
Reported cache size from current tree: 1866043
Reported buffer size from TTreeCache: 1866043
Reported cache size from chain: 1866256
Reported cache size from current tree: 1866256
Reported buffer size from TTreeCache: 1866256
TTreeCache buffer size changed, object location not checked

--- Start of subtest 15
Expand All @@ -257,14 +257,14 @@ Reported cache size from chain: -1
Chain reports 200 entries
Getting last entry from first file in chain
Reported AutoFlush from current tree: 50
Reported cache size from chain: 1435418
Reported cache size from current tree: 1435418
Reported buffer size from TTreeCache: 1435418
Reported cache size from chain: 1435581
Reported cache size from current tree: 1435581
Reported buffer size from TTreeCache: 1435581
Getting first entry from second file in chain
Reported AutoFlush from current tree: 65
Reported cache size from chain: 1435418
Reported cache size from current tree: 1435418
Reported buffer size from TTreeCache: 1435418
Reported cache size from chain: 1435581
Reported cache size from current tree: 1435581
Reported buffer size from TTreeCache: 1435581
TTreeCache object pointer stayed the same

--- Start of subtest 16
Expand Down Expand Up @@ -322,46 +322,46 @@ TTreeCache object pointer stayed the same
New TChain with two files, different cluster size, use a selector
No call to chain.SetCacheSize()
MySelector::Process called, entry=99
Reported cache size from fChain: 1304925
Reported cache size from fChain: 1305074
Reported AutoFlush value for the TTree 50
Reported cache size from TTree: 1304925
Buffer size of TTreeCache: 1304925
Reported cache size from TTree: 1305074
Buffer size of TTreeCache: 1305074
MySelector::Process called, entry=0
Reported cache size from fChain: 1696403
Reported cache size from fChain: 1696596
Reported AutoFlush value for the TTree 65
Reported cache size from TTree: 1696403
Buffer size of TTreeCache: 1696403
Reported cache size from TTree: 1696596
Buffer size of TTreeCache: 1696596
TTreeCache buffer size changed, object location not checked

* env variable ROOT_TTREECACHE_SIZE=1.1
--- Start of subtest 20
New TChain with two files, different cluster size, use a selector
No call to chain.SetCacheSize()
MySelector::Process called, entry=99
Reported cache size from fChain: 1435418
Reported cache size from fChain: 1435581
Reported AutoFlush value for the TTree 50
Reported cache size from TTree: 1435418
Buffer size of TTreeCache: 1435418
Reported cache size from TTree: 1435581
Buffer size of TTreeCache: 1435581
MySelector::Process called, entry=0
Reported cache size from fChain: 1866043
Reported cache size from fChain: 1866256
Reported AutoFlush value for the TTree 65
Reported cache size from TTree: 1866043
Buffer size of TTreeCache: 1866043
Reported cache size from TTree: 1866256
Buffer size of TTreeCache: 1866256
TTreeCache buffer size changed, object location not checked

--- Start of subtest 21
New TChain with two files, different cluster size, use a selector
-> Calling chain.SetCacheSize(-1) <-
MySelector::Process called, entry=99
Reported cache size from fChain: 1435418
Reported cache size from fChain: 1435581
Reported AutoFlush value for the TTree 50
Reported cache size from TTree: 1435418
Buffer size of TTreeCache: 1435418
Reported cache size from TTree: 1435581
Buffer size of TTreeCache: 1435581
MySelector::Process called, entry=0
Reported cache size from fChain: 1435418
Reported cache size from fChain: 1435581
Reported AutoFlush value for the TTree 65
Reported cache size from TTree: 1435418
Buffer size of TTreeCache: 1435418
Reported cache size from TTree: 1435581
Buffer size of TTreeCache: 1435581
TTreeCache object pointer stayed the same

--- Start of subtest 22
Expand Down
84 changes: 42 additions & 42 deletions root/tree/cache/autocacheZLIB_builtinzlib.ref
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,14 @@ Reported cache size from chain: 0
Chain reports 200 entries
Getting last entry from first file in chain
Reported AutoFlush from current tree: 50
Reported cache size from chain: 1435254
Reported cache size from current tree: 1435254
Reported buffer size from TTreeCache: 1435254
Reported cache size from chain: 1435336
Reported cache size from current tree: 1435336
Reported buffer size from TTreeCache: 1435336
Getting first entry from second file in chain
Reported AutoFlush from current tree: 57
Reported cache size from chain: 1435254
Reported cache size from current tree: 1435254
Reported buffer size from TTreeCache: 1435254
Reported cache size from chain: 1435336
Reported cache size from current tree: 1435336
Reported buffer size from TTreeCache: 1435336
TTreeCache object pointer stayed the same

--- Start of subtest 13
Expand All @@ -222,14 +222,14 @@ Reported cache size from chain: -1
Chain reports 200 entries
Getting last entry from first file in chain
Reported AutoFlush from current tree: 50
Reported cache size from chain: 1435254
Reported cache size from current tree: 1435254
Reported buffer size from TTreeCache: 1435254
Reported cache size from chain: 1435336
Reported cache size from current tree: 1435336
Reported buffer size from TTreeCache: 1435336
Getting first entry from second file in chain
Reported AutoFlush from current tree: 57
Reported cache size from chain: 1435254
Reported cache size from current tree: 1435254
Reported buffer size from TTreeCache: 1435254
Reported cache size from chain: 1435336
Reported cache size from current tree: 1435336
Reported buffer size from TTreeCache: 1435336
TTreeCache object pointer stayed the same

* Writing two root files, second with AutoFlush 1.3 times the first
Expand All @@ -240,14 +240,14 @@ Reported cache size from chain: 0
Chain reports 200 entries
Getting last entry from first file in chain
Reported AutoFlush from current tree: 50
Reported cache size from chain: 1435254
Reported cache size from current tree: 1435254
Reported buffer size from TTreeCache: 1435254
Reported cache size from chain: 1435336
Reported cache size from current tree: 1435336
Reported buffer size from TTreeCache: 1435336
Getting first entry from second file in chain
Reported AutoFlush from current tree: 65
Reported cache size from chain: 1865831
Reported cache size from current tree: 1865831
Reported buffer size from TTreeCache: 1865831
Reported cache size from chain: 1865937
Reported cache size from current tree: 1865937
Reported buffer size from TTreeCache: 1865937
TTreeCache buffer size changed, object location not checked

--- Start of subtest 15
Expand All @@ -257,14 +257,14 @@ Reported cache size from chain: -1
Chain reports 200 entries
Getting last entry from first file in chain
Reported AutoFlush from current tree: 50
Reported cache size from chain: 1435254
Reported cache size from current tree: 1435254
Reported buffer size from TTreeCache: 1435254
Reported cache size from chain: 1435336
Reported cache size from current tree: 1435336
Reported buffer size from TTreeCache: 1435336
Getting first entry from second file in chain
Reported AutoFlush from current tree: 65
Reported cache size from chain: 1435254
Reported cache size from current tree: 1435254
Reported buffer size from TTreeCache: 1435254
Reported cache size from chain: 1435336
Reported cache size from current tree: 1435336
Reported buffer size from TTreeCache: 1435336
TTreeCache object pointer stayed the same

--- Start of subtest 16
Expand Down Expand Up @@ -322,46 +322,46 @@ TTreeCache object pointer stayed the same
New TChain with two files, different cluster size, use a selector
No call to chain.SetCacheSize()
MySelector::Process called, entry=99
Reported cache size from fChain: 1304777
Reported cache size from fChain: 1304851
Reported AutoFlush value for the TTree 50
Reported cache size from TTree: 1304777
Buffer size of TTreeCache: 1304777
Reported cache size from TTree: 1304851
Buffer size of TTreeCache: 1304851
MySelector::Process called, entry=0
Reported cache size from fChain: 1696210
Reported cache size from fChain: 1696306
Reported AutoFlush value for the TTree 65
Reported cache size from TTree: 1696210
Buffer size of TTreeCache: 1696210
Reported cache size from TTree: 1696306
Buffer size of TTreeCache: 1696306
TTreeCache buffer size changed, object location not checked

* env variable ROOT_TTREECACHE_SIZE=1.1
--- Start of subtest 20
New TChain with two files, different cluster size, use a selector
No call to chain.SetCacheSize()
MySelector::Process called, entry=99
Reported cache size from fChain: 1435254
Reported cache size from fChain: 1435336
Reported AutoFlush value for the TTree 50
Reported cache size from TTree: 1435254
Buffer size of TTreeCache: 1435254
Reported cache size from TTree: 1435336
Buffer size of TTreeCache: 1435336
MySelector::Process called, entry=0
Reported cache size from fChain: 1865831
Reported cache size from fChain: 1865937
Reported AutoFlush value for the TTree 65
Reported cache size from TTree: 1865831
Buffer size of TTreeCache: 1865831
Reported cache size from TTree: 1865937
Buffer size of TTreeCache: 1865937
TTreeCache buffer size changed, object location not checked

--- Start of subtest 21
New TChain with two files, different cluster size, use a selector
-> Calling chain.SetCacheSize(-1) <-
MySelector::Process called, entry=99
Reported cache size from fChain: 1435254
Reported cache size from fChain: 1435336
Reported AutoFlush value for the TTree 50
Reported cache size from TTree: 1435254
Buffer size of TTreeCache: 1435254
Reported cache size from TTree: 1435336
Buffer size of TTreeCache: 1435336
MySelector::Process called, entry=0
Reported cache size from fChain: 1435254
Reported cache size from fChain: 1435336
Reported AutoFlush value for the TTree 65
Reported cache size from TTree: 1435254
Buffer size of TTreeCache: 1435254
Reported cache size from TTree: 1435336
Buffer size of TTreeCache: 1435336
TTreeCache object pointer stayed the same

--- Start of subtest 22
Expand Down
2 changes: 1 addition & 1 deletion root/tree/fastcloning/references/execCheckClusterRange_zlib.ref
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ Cluster #67 starts at 2340 and ends at 2369
Cluster #68 starts at 2370 and ends at 2399
******************************************************************************
*Tree :t1 : *
*Entries : 2400 : Total = 33566 bytes File Size = 20845 *
*Entries : 2400 : Total = 33566 bytes File Size = 20846 *
* : : Tree compression factor = 1.56 *
******************************************************************************
Cluster Range # Entry Start Last Entry Size Number of clusters
Expand Down
4 changes: 2 additions & 2 deletions root/tree/fastcloning/references/execCheckClusterRange_zlib_win64.ref
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Cluster #47 starts at 1740 and ends at 1769
Cluster #48 starts at 1770 and ends at 1799
******************************************************************************
*Tree :t1 : *
*Entries : 1800 : Total = 29346 bytes File Size = 17988 *
*Entries : 1800 : Total = 29346 bytes File Size = 17989 *
* : : Tree compression factor = 1.59 *
******************************************************************************
Cluster Range # Entry Start Last Entry Size Number of clusters
Expand Down Expand Up @@ -222,7 +222,7 @@ Cluster #67 starts at 2340 and ends at 2369
Cluster #68 starts at 2370 and ends at 2399
******************************************************************************
*Tree :t1 : *
*Entries : 2400 : Total = 33566 bytes File Size = 20847 *
*Entries : 2400 : Total = 33566 bytes File Size = 20845 *
* : : Tree compression factor = 1.56 *
******************************************************************************
Cluster Range # Entry Start Last Entry Size Number of clusters
Expand Down

0 comments on commit 556a7c8

Please sign in to comment.