diff --git a/tree/ntuple/v7/inc/ROOT/RField.hxx b/tree/ntuple/v7/inc/ROOT/RField.hxx index 4739617c87b18..4e0b453106cc3 100644 --- a/tree/ntuple/v7/inc/ROOT/RField.hxx +++ b/tree/ntuple/v7/inc/ROOT/RField.hxx @@ -351,37 +351,6 @@ public: namespace ROOT { namespace Experimental { -template <> -class RField<ClusterSize_t> final : public RSimpleField<ClusterSize_t> { -protected: - std::unique_ptr<RFieldBase> CloneImpl(std::string_view newName) const final - { - return std::make_unique<RField>(newName); - } - - const RColumnRepresentations &GetColumnRepresentations() const final; - using RSimpleField<ClusterSize_t>::GenerateColumns; - void GenerateColumns() final { throw RException(R__FAIL("RField<ClusterSize_t> must only be used for reading")); } - -public: - static std::string TypeName() { return "ROOT::Experimental::ClusterSize_t"; } - explicit RField(std::string_view name) : RSimpleField(name, TypeName()) {} - RField(RField &&other) = default; - RField &operator=(RField &&other) = default; - ~RField() override = default; - - /// Special help for offset fields - void GetCollectionInfo(NTupleSize_t globalIndex, RClusterIndex *collectionStart, ClusterSize_t *size) - { - fPrincipalColumn->GetCollectionInfo(globalIndex, collectionStart, size); - } - void GetCollectionInfo(RClusterIndex clusterIndex, RClusterIndex *collectionStart, ClusterSize_t *size) - { - fPrincipalColumn->GetCollectionInfo(clusterIndex, collectionStart, size); - } - void AcceptVisitor(Detail::RFieldVisitor &visitor) const final; -}; - template <typename SizeT> class RField<RNTupleCardinality<SizeT>> final : public RCardinalityField { protected: diff --git a/tree/ntuple/v7/inc/ROOT/RFieldVisitor.hxx b/tree/ntuple/v7/inc/ROOT/RFieldVisitor.hxx index cda144b216481..90063e7a2f214 100644 --- a/tree/ntuple/v7/inc/ROOT/RFieldVisitor.hxx +++ b/tree/ntuple/v7/inc/ROOT/RFieldVisitor.hxx @@ -54,7 +54,6 @@ public: virtual void VisitUnsplitField(const RUnsplitField &field) { VisitField(field); } virtual void VisitProxiedCollectionField(const RProxiedCollectionField &field) { VisitField(field); } virtual void VisitRecordField(const RRecordField &field) { VisitField(field); } - virtual void VisitClusterSizeField(const RField<ClusterSize_t> &field) { VisitField(field); } virtual void VisitCardinalityField(const RCardinalityField &field) { VisitField(field); } virtual void VisitDoubleField(const RField<double> &field) { VisitField(field); } virtual void VisitEnumField(const REnumField &field) { VisitField(field); } diff --git a/tree/ntuple/v7/src/RField.cxx b/tree/ntuple/v7/src/RField.cxx index 8a4a43506d2a4..3a1f3245a816f 100644 --- a/tree/ntuple/v7/src/RField.cxx +++ b/tree/ntuple/v7/src/RField.cxx @@ -1328,22 +1328,6 @@ void ROOT::Experimental::RFieldZero::AcceptVisitor(Detail::RFieldVisitor &visito //------------------------------------------------------------------------------ -const ROOT::Experimental::RFieldBase::RColumnRepresentations & -ROOT::Experimental::RField<ROOT::Experimental::ClusterSize_t>::GetColumnRepresentations() const -{ - static RColumnRepresentations representations( - {{EColumnType::kSplitIndex64}, {EColumnType::kIndex64}, {EColumnType::kSplitIndex32}, {EColumnType::kIndex32}}, - {}); - return representations; -} - -void ROOT::Experimental::RField<ROOT::Experimental::ClusterSize_t>::AcceptVisitor(Detail::RFieldVisitor &visitor) const -{ - visitor.VisitClusterSizeField(*this); -} - -//------------------------------------------------------------------------------ - const ROOT::Experimental::RFieldBase::RColumnRepresentations & ROOT::Experimental::RCardinalityField::GetColumnRepresentations() const { diff --git a/tree/ntuple/v7/test/ntuple_packing.cxx b/tree/ntuple/v7/test/ntuple_packing.cxx index 6e480cbe40b5d..d486865ac841b 100644 --- a/tree/ntuple/v7/test/ntuple_packing.cxx +++ b/tree/ntuple/v7/test/ntuple_packing.cxx @@ -279,7 +279,7 @@ class RFieldTestIndexColumn final : public ROOT::Experimental::RSimpleField<Clus } public: - explicit RFieldTestIndexColumn(std::string_view name) : RSimpleField(name, "ROOT::Experimental::ClusterSize_t") {} + explicit RFieldTestIndexColumn(std::string_view name) : RSimpleField(name, "ROOT::Experimental::RClusterSize") {} RFieldTestIndexColumn(RFieldTestIndexColumn &&other) = default; RFieldTestIndexColumn &operator=(RFieldTestIndexColumn &&other) = default; ~RFieldTestIndexColumn() override = default;