Skip to content

Commit

Permalink
[ntuple] several fixes to column representation of fields
Browse files Browse the repository at this point in the history
  • Loading branch information
jblomer committed Jun 14, 2024
1 parent 3a59db4 commit 5aa3b51
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions tree/ntuple/v7/src/RField.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1238,7 +1238,7 @@ ROOT::Experimental::RCardinalityField::As64Bit() const
const ROOT::Experimental::RFieldBase::RColumnRepresentations &
ROOT::Experimental::RField<char>::GetColumnRepresentations() const
{
static RColumnRepresentations representations({{EColumnType::kChar}}, {{}});
static RColumnRepresentations representations({{EColumnType::kChar}}, {});
return representations;
}

Expand All @@ -1263,7 +1263,7 @@ void ROOT::Experimental::RField<char>::AcceptVisitor(Detail::RFieldVisitor &visi
const ROOT::Experimental::RFieldBase::RColumnRepresentations &
ROOT::Experimental::RField<std::byte>::GetColumnRepresentations() const
{
static RColumnRepresentations representations({{EColumnType::kByte}}, {{}});
static RColumnRepresentations representations({{EColumnType::kByte}}, {});
return representations;
}

Expand Down Expand Up @@ -1394,8 +1394,12 @@ void ROOT::Experimental::RField<float>::SetHalfPrecision()
const ROOT::Experimental::RFieldBase::RColumnRepresentations &
ROOT::Experimental::RField<double>::GetColumnRepresentations() const
{
static RColumnRepresentations representations(
{{EColumnType::kSplitReal64}, {EColumnType::kReal64}, {EColumnType::kSplitReal32}, {EColumnType::kReal32}}, {});
static RColumnRepresentations representations({{EColumnType::kSplitReal64},
{EColumnType::kReal64},
{EColumnType::kSplitReal32},
{EColumnType::kReal32},
{EColumnType::kReal16}},
{});
return representations;
}

Expand Down Expand Up @@ -3347,7 +3351,7 @@ void ROOT::Experimental::RVariantField::ReadGlobalImpl(NTupleSize_t globalIndex,
const ROOT::Experimental::RFieldBase::RColumnRepresentations &
ROOT::Experimental::RVariantField::GetColumnRepresentations() const
{
static RColumnRepresentations representations({{EColumnType::kSwitch}}, {{}});
static RColumnRepresentations representations({{EColumnType::kSwitch}}, {});
return representations;
}

Expand Down

0 comments on commit 5aa3b51

Please sign in to comment.