diff --git a/root/io/filemerger/CMakeLists.txt b/root/io/filemerger/CMakeLists.txt index 35f983bc6f..929ebc6da6 100644 --- a/root/io/filemerger/CMakeLists.txt +++ b/root/io/filemerger/CMakeLists.txt @@ -75,7 +75,7 @@ if(ZLIB_CF) else() ROOTTEST_ADD_TEST(merged-zlib PRECMD ${ROOT_hadd_CMD} -f101 mzlibfile1-4.root mzlibfile1-2.root mzlibfile3-4.root - COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testMergedFile.C(\"mzlibfile1-4.root\",101,5014,20)" + COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testMergedFile.C(\"mzlibfile1-4.root\",101,5020,20)" DEPENDS datagen-hadd-mzlibfile12 DEPENDS datagen-hadd-mzlibfile34) endif() @@ -95,7 +95,7 @@ if(${LZ4_VERSION} VERSION_LESS "1.7.5") elseif(${LZ4_VERSION} VERSION_GREATER_EQUAL "1.7.5") ROOTTEST_ADD_TEST(merged-lz4 PRECMD ${ROOT_hadd_CMD} -f404 mlz4file1-4.root mlz4file1-2.root mlz4file3-4.root - COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testMergedFile.C(\"mlz4file1-4.root\",404,5395,5)" + COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testMergedFile.C(\"mlz4file1-4.root\",404,5415,5)" DEPENDS datagen-hadd-mlz4file12 DEPENDS datagen-hadd-mlz4file34) endif() @@ -212,7 +212,7 @@ if(${compression_default} STREQUAL "zlib") ROOTTEST_ADD_TEST(simplek-lz4-compr-level4 PRECMD ${ROOT_hadd_CMD} -fk404 hsimpleK404.root hsimpleK209.root hsimpleK.root hsimple.root hsimple9.root hsimple209.root hsimple409.root hsimple92.root - COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK404.root\",24*25000,404,12047492,30)" + COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK404.root\",24*25000,404,12047502,30)" DEPENDS roottest-root-io-filemerger-hsimple DEPENDS simple-lz4-compr-level9 DEPENDS simple-lzma-compr-level9 @@ -222,17 +222,17 @@ if(${compression_default} STREQUAL "zlib") ROOTTEST_ADD_TEST(simple-lz4-compr-level4 PRECMD ${ROOT_hadd_CMD} -f404 hsimple404.root hsimple.root - COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple404.root\",25000,404,517262,15)" + COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple404.root\",25000,404,517292,15)" DEPENDS roottest-root-io-filemerger-hsimple) ROOTTEST_ADD_TEST(simple-lz4-compr-level9 PRECMD ${ROOT_hadd_CMD} -f409 hsimple409.root hsimple.root - COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple409.root\",25000,409,517008,15)" + COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple409.root\",25000,409,517020,15)" DEPENDS roottest-root-io-filemerger-hsimple) ROOTTEST_ADD_TEST(simple-lz4-compr-level1 PRECMD ${ROOT_hadd_CMD} -f401 hsimple401.root hsimple.root - COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple401.root\",25000,401,519976,5)" + COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple401.root\",25000,401,520007,5)" DEPENDS roottest-root-io-filemerger-hsimple) else() ROOTTEST_ADD_TEST(simple-default-compr-level9 @@ -325,7 +325,7 @@ if(${compression_default} STREQUAL "zlib") elseif(${LZ4_VERSION} VERSION_GREATER_EQUAL "1.7.5") ROOTTEST_ADD_TEST(simplek-lz4-compr-level4 PRECMD ${ROOT_hadd_CMD} -fk404 hsimpleK404.root hsimpleK209.root hsimpleK.root hsimple.root hsimple9.root hsimple209.root hsimple409.root hsimple92.root - COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK404.root\",24*25000,404,12047492,30)" + COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK404.root\",24*25000,404,12047512,30)" DEPENDS roottest-root-io-filemerger-hsimple DEPENDS simple-lz4-compr-level9 DEPENDS simple-lzma-compr-level9 @@ -335,22 +335,22 @@ if(${compression_default} STREQUAL "zlib") ROOTTEST_ADD_TEST(simple-lz4-compr-level4 PRECMD ${ROOT_hadd_CMD} -f404 hsimple404.root hsimple.root - COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple404.root\",25000,404,517262,15)" + COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple404.root\",25000,404,517292,15)" DEPENDS roottest-root-io-filemerger-hsimple) if(CMAKE_SYSTEM_PROCESSOR MATCHES aarch64) ROOTTEST_ADD_TEST(simple-lz4-compr-level9 PRECMD ${ROOT_hadd_CMD} -f409 hsimple409.root hsimple.root - COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple409.root\",25000,409,516975,30)" + COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple409.root\",25000,409,517004,30)" DEPENDS roottest-root-io-filemerger-hsimple) else() ROOTTEST_ADD_TEST(simple-lz4-compr-level9 PRECMD ${ROOT_hadd_CMD} -f409 hsimple409.root hsimple.root - COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple409.root\",25000,409,517008,15)" + COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple409.root\",25000,409,517020,15)" DEPENDS roottest-root-io-filemerger-hsimple) endif() ROOTTEST_ADD_TEST(simple-lz4-compr-level1 PRECMD ${ROOT_hadd_CMD} -f401 hsimple401.root hsimple.root - COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple401.root\",25000,401,519976,10)" + COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple401.root\",25000,401,520007,10)" DEPENDS roottest-root-io-filemerger-hsimple) endif() @@ -368,5 +368,5 @@ endif() ROOTTEST_ADD_TEST(simple-lzma-compr-level9 PRECMD ${ROOT_hadd_CMD} -f209 hsimple209.root hsimple.root - COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple209.root\",25000,209,392709,17)" + COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple209.root\",25000,209,392716,17)" DEPENDS roottest-root-io-filemerger-hsimple) diff --git a/root/meta/MemberComments.ref b/root/meta/MemberComments.ref index 25e00ec5c0..37caa172a5 100644 --- a/root/meta/MemberComments.ref +++ b/root/meta/MemberComments.ref @@ -588,6 +588,10 @@ OBJ: TList TList Doubly linked list : 0 TH1::Class()->GetMenuItems(): OBJ: TList TList Doubly linked list : 0 + OBJ: TMethod AutoZoom *MENU* : 0 + void TH1::AutoZoom() + OBJ: TMethod UnZoom *MENU* : 0 + void TH1::UnZoom() OBJ: TMethod DrawPanel *MENU* : 0 void TH1::DrawPanel() OBJ: TMethod Fit *MENU* : 0 diff --git a/root/meta/MemberComments_win32.ref b/root/meta/MemberComments_win32.ref index c63169024c..70e5557514 100644 --- a/root/meta/MemberComments_win32.ref +++ b/root/meta/MemberComments_win32.ref @@ -588,6 +588,10 @@ OBJ: TList TList Doubly linked list : 0 TH1::Class()->GetMenuItems(): OBJ: TList TList Doubly linked list : 0 + OBJ: TMethod AutoZoom *MENU* : 0 + void TH1::AutoZoom() + OBJ: TMethod UnZoom *MENU* : 0 + void TH1::UnZoom() OBJ: TMethod DrawPanel *MENU* : 0 void TH1::DrawPanel() OBJ: TMethod Fit *MENU* : 0 diff --git a/root/meta/MemberComments_win64.ref b/root/meta/MemberComments_win64.ref index c63169024c..70e5557514 100644 --- a/root/meta/MemberComments_win64.ref +++ b/root/meta/MemberComments_win64.ref @@ -588,6 +588,10 @@ OBJ: TList TList Doubly linked list : 0 TH1::Class()->GetMenuItems(): OBJ: TList TList Doubly linked list : 0 + OBJ: TMethod AutoZoom *MENU* : 0 + void TH1::AutoZoom() + OBJ: TMethod UnZoom *MENU* : 0 + void TH1::UnZoom() OBJ: TMethod DrawPanel *MENU* : 0 void TH1::DrawPanel() OBJ: TMethod Fit *MENU* : 0