Skip to content

Commit

Permalink
[ntuple] minor improvement in accessing compression settings
Browse files Browse the repository at this point in the history
  • Loading branch information
jblomer committed Jan 14, 2025
1 parent 414a240 commit fde7538
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions tree/ntuple/v7/src/RNTupleDescriptorFmt.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ void ROOT::Experimental::RNTupleDescriptor::PrintInfo(std::ostream &output) cons
continue;

info.fNElements += columnRange.fNElements;
if (compression == -1) {
compression = columnRange.fCompressionSettings.value();
if (compression == -1 && columnRange.fCompressionSettings) {
compression = *columnRange.fCompressionSettings;
}
const auto &pageRange = cluster.second.GetPageRange(column.second.GetPhysicalId());
auto idx = cluster2Idx[cluster.first];
Expand Down
2 changes: 1 addition & 1 deletion tree/ntuple/v7/src/RNTupleMerger.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ struct RChangeCompressionFunc {
sealConf.fElement = &fDstColElement;
sealConf.fPage = &page;
sealConf.fBuffer = fBuffer;
sealConf.fCompressionSetting = fMergeOptions.fCompressionSettings.value();
sealConf.fCompressionSetting = *fMergeOptions.fCompressionSettings;
sealConf.fWriteChecksum = fSealedPage.GetHasChecksum();
auto refSealedPage = RPageSink::SealPage(sealConf);
fSealedPage = refSealedPage;
Expand Down

0 comments on commit fde7538

Please sign in to comment.