Skip to content

Commit 472178e

Browse files
committed
[df] Reorganize RSnapshotOptions data members
Groups the format-specific options together.
1 parent 66c330a commit 472178e

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

tree/dataframe/inc/ROOT/RSnapshotOptions.hxx

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,15 @@ struct RSnapshotOptions {
165165
bool enablePageChecksums = true, bool enableSamePageMerging = true,
166166
ESnapshotOutputFormat outputFormat = ESnapshotOutputFormat::kDefault)
167167
: fMode(mode),
168+
fOutputFormat(outputFormat),
168169
fCompressionAlgorithm(comprAlgo),
169170
fCompressionLevel{comprLevel},
170-
fAutoFlush(autoFlush),
171-
fSplitLevel(splitLevel),
172171
fLazy(lazy),
173172
fOverwriteIfExists(overwriteIfExists),
174173
fVector2RVec(vector2RVec),
174+
fAutoFlush(autoFlush),
175+
fSplitLevel(splitLevel),
175176
fBasketSize(basketSize),
176-
fOutputFormat(outputFormat),
177177
fApproxZippedClusterSize(approxZippedClusterSize),
178178
fMaxUnzippedClusterSize(maxUnzippedClusterSize),
179179
fInitialUnzippedPageSize(initUnzippedPageSize),
@@ -183,18 +183,22 @@ struct RSnapshotOptions {
183183
{
184184
}
185185
std::string fMode = "RECREATE"; ///< Mode of creation of output file
186+
ESnapshotOutputFormat fOutputFormat = ESnapshotOutputFormat::kDefault; ///< Which data format to write to
186187
ECAlgo fCompressionAlgorithm =
187188
ROOT::RCompressionSetting::EAlgorithm::kZSTD; ///< Compression algorithm of output file
188189
int fCompressionLevel = 5; ///< Compression level of output file
189-
int fAutoFlush = 0; ///< AutoFlush value for output tree
190-
int fSplitLevel = 99; ///< Split level of output tree
191190
bool fLazy = false; ///< Do not start the event loop when Snapshot is called
192191
bool fOverwriteIfExists = false; ///< If fMode is "UPDATE", overwrite object in output file if it already exists
193192
bool fVector2RVec = true; ///< If set to true will convert std::vector columns to RVec when saving to disk
194193
bool fIncludeVariations = false; ///< Include columns that result from a Vary() action
195-
int fBasketSize = -1; ///< Set a custom basket size option. For more details, see
196-
///< https://root.cern/manual/trees/#baskets-clusters-and-the-tree-header
197-
ESnapshotOutputFormat fOutputFormat = ESnapshotOutputFormat::kDefault; ///< Which data format to write to
194+
195+
/// *(TTree only)* AutoFlush value for output tree
196+
int fAutoFlush = 0;
197+
/// *(TTree only)* Split level of output tree
198+
int fSplitLevel = 99;
199+
/// *(TTree only)* Set a custom basket size option. For more details, see
200+
/// https://root.cern/manual/trees/#baskets-clusters-and-the-tree-header
201+
int fBasketSize = -1;
198202

199203
/// *(RNTuple only)* Approximate target compressed cluster size
200204
std::size_t fApproxZippedClusterSize = 128 * 1024 * 1024;

0 commit comments

Comments
 (0)