silverweed/rntviewer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix ROOT namespaces

Browse source
This commit is contained in:
silverweed 2025-02-12 15:34:15 +01:00
parent 7858cff5fe
commit 030cde29f2
3 changed files with 8 additions and 9 deletions

4
src/hover.cpp
View file

@ -726,11 +726,11 @@ struct Sec_Hover_Fn {
cur_field_off = start_off + size; cur_field_off = start_off + size;
} }
void display_individual_elem(ROOT::Experimental::ENTupleColumnType type, u64 elem_idx, u64 n_elems, u64 field_len) void display_individual_elem(ROOT::ENTupleColumnType type, u64 elem_idx, u64 n_elems, u64 field_len)
{ {
String8 title = push_str8f(arena, "Element %" PRIu64 " / %" PRIu64, elem_idx, n_elems); String8 title = push_str8f(arena, "Element %" PRIu64 " / %" PRIu64, elem_idx, n_elems);
titled_section(title.c(), [=] { titled_section(title.c(), [=] {
using CT = ROOT::Experimental::ENTupleColumnType; using CT = ROOT::ENTupleColumnType;
switch(type) { switch(type) {
case CT::kIndex64: case CT::kIndex64:
case CT::kUInt64: return field_le<u64>("Value: %" PRIu64); case CT::kUInt64: return field_le<u64>("Value: %" PRIu64);

11
src/rntuple.cpp
View file

@ -34,7 +34,6 @@ internal
ROOT::Experimental::RNTupleDescriptor create_descriptor(Arena *arena, const ROOT::RNTuple &anchor, ROOT::Experimental::RNTupleDescriptor create_descriptor(Arena *arena, const ROOT::RNTuple &anchor,
ROOT::Experimental::Internal::RMiniFileReader &reader) ROOT::Experimental::Internal::RMiniFileReader &reader)
{ {
using ROOT::Experimental::DescriptorId_t;
using ROOT::Experimental::RNTupleDescriptor; using ROOT::Experimental::RNTupleDescriptor;
using ROOT::Experimental::RClusterGroupDescriptor; using ROOT::Experimental::RClusterGroupDescriptor;
using ROOT::Experimental::Internal::RNTupleDescriptorBuilder; using ROOT::Experimental::Internal::RNTupleDescriptorBuilder;
@ -83,7 +82,7 @@ ROOT::Experimental::RNTupleDescriptor create_descriptor(Arena *arena, const ROOT
RNTupleDecompressor::Unzip(page_list_zip, page_list_zip_size, page_list_len, page_list); RNTupleDecompressor::Unzip(page_list_zip, page_list_zip_size, page_list_len, page_list);
// Deserialize page list // Deserialize page list
DescriptorId_t cluster_grpid = cgdesc.GetId(); ROOT::DescriptorId_t cluster_grpid = cgdesc.GetId();
try { try {
RNTupleSerializer::DeserializePageList(page_list, page_list_len, cluster_grpid, descriptor, RNTupleSerializer::DeserializePageList(page_list, page_list_len, cluster_grpid, descriptor,
RNTupleSerializer::EDescriptorDeserializeMode::kForReading); RNTupleSerializer::EDescriptorDeserializeMode::kForReading);
@ -102,9 +101,9 @@ String8 build_fully_qualified_field_name(Arena *arena, const ROOT::Experimental:
const ROOT::Experimental::RFieldDescriptor *field_desc) const ROOT::Experimental::RFieldDescriptor *field_desc)
{ {
String8_Node *sn = push_str8_node(arena, nullptr, "%s", field_desc->GetFieldName().c_str()); String8_Node *sn = push_str8_node(arena, nullptr, "%s", field_desc->GetFieldName().c_str());
ROOT::Experimental::DescriptorId_t field_id = field_desc->GetParentId(); ROOT::DescriptorId_t field_id = field_desc->GetParentId();
u64 size = sn->str.size; u64 size = sn->str.size;
while (field_id != ROOT::Experimental::kInvalidDescriptorId) { while (field_id != ROOT::kInvalidDescriptorId) {
field_desc = &desc.GetFieldDescriptor(field_id); field_desc = &desc.GetFieldDescriptor(field_id);
if (field_desc->GetFieldName().empty()) if (field_desc->GetFieldName().empty())
break; break;
@ -184,7 +183,7 @@ RNTuple_Data get_rntuple_data(Arena *arena, const Inspected_File &file, const TF
using ROOT::Experimental::RNTupleDescriptor; using ROOT::Experimental::RNTupleDescriptor;
using ROOT::Experimental::RClusterGroupDescriptor; using ROOT::Experimental::RClusterGroupDescriptor;
using ROOT::Experimental::RClusterDescriptor; using ROOT::Experimental::RClusterDescriptor;
using ROOT::Experimental::RNTupleLocator; using ROOT::RNTupleLocator;
using ROOT::Experimental::Internal::RColumnElementBase; using ROOT::Experimental::Internal::RColumnElementBase;
using ROOT::Experimental::RNTupleDescriptor; using ROOT::Experimental::RNTupleDescriptor;
@ -256,7 +255,7 @@ RNTuple_Data get_rntuple_data(Arena *arena, const Inspected_File &file, const TF
for (const RClusterDescriptor::RColumnRange &col_range : cluster_desc.GetColumnRangeIterable()) { for (const RClusterDescriptor::RColumnRange &col_range : cluster_desc.GetColumnRangeIterable()) {
const auto &col_descriptor = descriptor.GetColumnDescriptor(col_range.fPhysicalColumnId); const auto &col_descriptor = descriptor.GetColumnDescriptor(col_range.fPhysicalColumnId);
ROOT::Experimental::ENTupleColumnType elem_type = col_descriptor.GetType(); ROOT::ENTupleColumnType elem_type = col_descriptor.GetType();
const char *elem_type_name = RColumnElementBase::GetColumnTypeName(elem_type); const char *elem_type_name = RColumnElementBase::GetColumnTypeName(elem_type);
const auto &field_desc = descriptor.GetFieldDescriptor(col_descriptor.GetFieldId()); const auto &field_desc = descriptor.GetFieldDescriptor(col_descriptor.GetFieldId());
String8 owner_field_name = build_fully_qualified_field_name(arena, descriptor, &field_desc); String8 owner_field_name = build_fully_qualified_field_name(arena, descriptor, &field_desc);

2
src/rntuple.h
View file

@ -22,7 +22,7 @@ struct Page_Info_Node {
u64 page_id; u64 page_id;
u8 bits_per_elem; u8 bits_per_elem;
ROOT::Experimental::ENTupleColumnType elem_type; ROOT::ENTupleColumnType elem_type;
String8 elem_type_name; String8 elem_type_name;
String8 owner_field_name; String8 owner_field_name;
const RNTuple_Anchor_Info *owner_ntuple; const RNTuple_Anchor_Info *owner_ntuple;