From 43bf8e876428c0fc9fa93a540fcd5f2206719a33 Mon Sep 17 00:00:00 2001 From: Danilo Piparo Date: Thu, 4 Apr 2024 08:37:50 +0200 Subject: [PATCH 1/4] Update ROOT version file --- core/foundation/inc/ROOT/RVersion.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/foundation/inc/ROOT/RVersion.hxx b/core/foundation/inc/ROOT/RVersion.hxx index 9ed376ab8eef4..64cccde54e944 100644 --- a/core/foundation/inc/ROOT/RVersion.hxx +++ b/core/foundation/inc/ROOT/RVersion.hxx @@ -4,8 +4,8 @@ /* Update on release: */ #define ROOT_VERSION_MAJOR 6 #define ROOT_VERSION_MINOR 31 -#define ROOT_VERSION_PATCH 01 -#define ROOT_RELEASE_DATE "Oct 10 2023" +#define ROOT_VERSION_PATCH 99 +#define ROOT_RELEASE_DATE "Apr 4 2024" /* Don't change the lines below. */ From 6e27bd1534ac140e6016178bcb77b11f00b1ff26 Mon Sep 17 00:00:00 2001 From: Danilo Piparo Date: Thu, 4 Apr 2024 08:44:44 +0200 Subject: [PATCH 2/4] [doc] Update reference guide build procedure --- documentation/doxygen/Doxyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/doxygen/Doxyfile b/documentation/doxygen/Doxyfile index 56b40b16c1d8e..9f35d5e804b3e 100644 --- a/documentation/doxygen/Doxyfile +++ b/documentation/doxygen/Doxyfile @@ -1594,7 +1594,7 @@ SITEMAP_URL = # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. -GENERATE_QHP = YES +GENERATE_QHP = NO # If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify # the file name of the resulting .qch file. The path specified is relative to From 512eb25da05bece70b072794ff08a1d74c14bbbc Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Mon, 11 Mar 2024 10:00:55 +0100 Subject: [PATCH 3/4] [skip-ci] [io] Collapse data format details of TFile class. Supersedes https://github.com/root-project/root/pull/9616 --- io/io/src/TFile.cxx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/io/io/src/TFile.cxx b/io/io/src/TFile.cxx index 15450dfc23cf0..b68dca22032de 100644 --- a/io/io/src/TFile.cxx +++ b/io/io/src/TFile.cxx @@ -13,6 +13,11 @@ \file TFile.cxx \class TFile \ingroup IO +\brief A ROOT file is an on-disk file, usually with extension .root, that stores objects in a file-system-like logical structure, possibly including subdirectory hierarchies. +\sa \ref IO + +
+ROOT file data format specification A ROOT file is composed of a header, followed by consecutive data records (`TKey` instances) with a well defined format. @@ -21,6 +26,7 @@ The first data record starts at byte fBEGIN (currently set to kBEGIN). Bytes 1->kBEGIN contain the file description, when fVersion >= 1000000 it is a large file (> 2 GB) and the offsets will be 8 bytes long and fUnits will be set to 8: + Byte Range | Record Name | Description ----------------|-------------|------------ 1->4 | "root" | Root file identifier @@ -69,7 +75,10 @@ Byte Range | Member Name | Description Begin_Macro ../../../tutorials/io/file.C End_Macro + The structure of a directory is shown in TDirectoryFile::TDirectoryFile + +
*/ #include From ce12cce0fc2e5cb69e0eeacc1e526aa1c652afaf Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Mon, 11 Mar 2024 10:08:16 +0100 Subject: [PATCH 4/4] [skip-ci] cross-reference markdown docu with link as well as human-readable as requested by pcanal --- io/io/src/TFile.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/io/io/src/TFile.cxx b/io/io/src/TFile.cxx index b68dca22032de..3e162a8211d31 100644 --- a/io/io/src/TFile.cxx +++ b/io/io/src/TFile.cxx @@ -15,6 +15,7 @@ \ingroup IO \brief A ROOT file is an on-disk file, usually with extension .root, that stores objects in a file-system-like logical structure, possibly including subdirectory hierarchies. \sa \ref IO +\sa \ref rootio (or `io/doc/TFile` folder in your codebase)
ROOT file data format specification