diff --git a/.gitignore b/.gitignore index 64ad261..e1ccdaa 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,8 @@ ENV/ /src/skhep_testdata/version.py /pip-wheel-metadata/* /src/skhep_testdata/data/file_list.txt + +# Temporary files when generating ROOT files +dev/make-root/*.root +dev/make-root/*.so +dev/make-root/*.d diff --git a/dev/make-root/rntuple_1jag_int_float.C b/dev/make-root/rntuple_1jag_int_float.C index b4fac3d..d914288 100644 --- a/dev/make-root/rntuple_1jag_int_float.C +++ b/dev/make-root/rntuple_1jag_int_float.C @@ -3,13 +3,14 @@ R__LOAD_LIBRARY(ROOTNTuple); #include #include #include +#include #include using RNTupleModel = ROOT::Experimental::RNTupleModel; using RNTupleWriter = ROOT::Experimental::RNTupleWriter; void rntuple_1jag_int_float() { - std::string rootFileName{"test_ntuple_1jag_int_float.root"}; + std::string rootFileName{"test_1jag_int_float_rntuple_v1-0-0-0.root"}; auto model = RNTupleModel::Create(); auto v_int = model->MakeField>("one_v_integers"); auto v_float = model->MakeField>("two_v_floats"); diff --git a/dev/make-root/Run2012BC_DoubleMuParked_Muons_rntuple_1000evts.md b/dev/make-root/rntuple_Run2012BC_DoubleMuParked_Muons_1000evts.md similarity index 87% rename from dev/make-root/Run2012BC_DoubleMuParked_Muons_rntuple_1000evts.md rename to dev/make-root/rntuple_Run2012BC_DoubleMuParked_Muons_1000evts.md index 4e7d9ec..dda4e52 100644 --- a/dev/make-root/Run2012BC_DoubleMuParked_Muons_rntuple_1000evts.md +++ b/dev/make-root/rntuple_Run2012BC_DoubleMuParked_Muons_1000evts.md @@ -1,7 +1,7 @@ First, download `Run2012BC_DoubleMuParked_Muons.root` from [here](https://opendata.cern.ch/record/12341). Then, run the following commands in ROOT. ```cpp -auto importer = ROOT::Experimental::RNTupleImporter::Create("./Run2012BC_DoubleMuParked_Muons.root", "Events", "./Run2012BC_DoubleMuParked_Muons_rntuple_1000evts.root"); +auto importer = ROOT::Experimental::RNTupleImporter::Create("./Run2012BC_DoubleMuParked_Muons.root", "Events", "./Run2012BC_DoubleMuParked_Muons_1000evts_rntuple_v1-0-0-0.root"); auto c = importer.get(); c->SetMaxEntries(1000); c->Import() diff --git a/dev/make-root/rntuple_atomic_bitset.C b/dev/make-root/rntuple_atomic_bitset.C index 45b8f37..defebe9 100644 --- a/dev/make-root/rntuple_atomic_bitset.C +++ b/dev/make-root/rntuple_atomic_bitset.C @@ -13,7 +13,7 @@ using RNTupleModel = ROOT::Experimental::RNTupleModel; using RNTupleWriter = ROOT::Experimental::RNTupleWriter; void rntuple_atomic_bitset() { - std::string rootFileName{"test_ntuple_atomic_bitset.root"}; + std::string rootFileName{"test_atomic_bitset_rntuple_v1-0-0-0.root"}; auto model = RNTupleModel::Create(); auto atomic_int_field = model->MakeField>("atomic_int"); auto bitset_field = model->MakeField>("bitset"); diff --git a/dev/make-root/rntuple_bit.C b/dev/make-root/rntuple_bit.C index 2a1968d..3d19cb0 100644 --- a/dev/make-root/rntuple_bit.C +++ b/dev/make-root/rntuple_bit.C @@ -2,13 +2,14 @@ R__LOAD_LIBRARY(ROOTNTuple) #include #include #include +#include #include using RNTupleModel = ROOT::Experimental::RNTupleModel; using RNTupleWriter = ROOT::Experimental::RNTupleWriter; void rntuple_bit() { - std::string rootFileName{"test_ntuple_bit.root"}; + std::string rootFileName{"test_bit_rntuple_v1-0-0-0.root"}; auto model = RNTupleModel::Create(); auto bit_field = model->MakeField("one_bit"); auto ntuple = diff --git a/dev/make-root/rntuple_emptystruct_invalidvar.C b/dev/make-root/rntuple_emptystruct_invalidvar.C index 79d1b6b..7c0a8b6 100644 --- a/dev/make-root/rntuple_emptystruct_invalidvar.C +++ b/dev/make-root/rntuple_emptystruct_invalidvar.C @@ -17,12 +17,13 @@ struct EmptyStruct {}; struct StructForVariant { int i; StructForVariant() = default; + StructForVariant(int ii) : i(ii) {}; StructForVariant(const StructForVariant &) { throw std::runtime_error("copy ctor"); } StructForVariant &operator=(const StructForVariant &) = default; }; void rntuple_emptystruct_invalidvar() { - std::string rootFileName{"test_ntuple_emptystruct_invalidvar.root"}; + std::string rootFileName{"test_emptystruct_invalidvar_rntuple_v1-0-0-0.root"}; auto model = RNTupleModel::Create(); auto empty_struct_field = model->MakeField("empty_struct"); auto variant_field = model->MakeField>("variant"); @@ -33,9 +34,6 @@ void rntuple_emptystruct_invalidvar() { *variant_field = 1; // valid state ntuple->Fill(); - *variant_field = { 1 }; // valid state - ntuple->Fill(); - try { *variant_field = StructForVariant(); // invalid state } catch (const std::runtime_error &e) { @@ -43,4 +41,7 @@ void rntuple_emptystruct_invalidvar() { } assert(variant_field->valueless_by_exception()); ntuple->Fill(); + + variant_field->emplace(2); // valid state + ntuple->Fill(); } diff --git a/dev/make-root/rntuple_extension_columns.C b/dev/make-root/rntuple_extension_columns.C new file mode 100644 index 0000000..a1963b2 --- /dev/null +++ b/dev/make-root/rntuple_extension_columns.C @@ -0,0 +1,56 @@ +/* https://root.cern/doc/master/ntpl001__staff_8C.html */ +R__LOAD_LIBRARY(ROOTNTuple) +#include +#include +#include +#include +#include +#include + +#include +#include + +using RNTupleModel = ROOT::Experimental::RNTupleModel; +using RNTupleWriter = ROOT::Experimental::RNTupleWriter; +using RNTupleWriteOptions = ROOT::Experimental::RNTupleWriteOptions; + +void rntuple_extension_columns() { + auto options = RNTupleWriteOptions(); + options.SetMaxUnzippedPageSize(700); + options.SetApproxZippedClusterSize(2000); + options.SetMaxUnzippedClusterSize(2000); + + std::string rootFileName{"test_extension_columns_rntuple_v1-0-0-0.root"}; + auto model = RNTupleModel::Create(); + auto int_field = model->MakeField("int_field"); + + auto ntuple = RNTupleWriter::Recreate(std::move(model), "ntuple", rootFileName, options); + + for (int i = 0; i < 200; i++) { + *int_field = i; + ntuple->Fill(); + } + + auto modelUpdater = ntuple->CreateModelUpdater(); + modelUpdater->BeginUpdate(); + auto vec_fload = modelUpdater->MakeField("float_field"); + modelUpdater->CommitUpdate(); + + for (int i = 0; i < 200; i++) { + *int_field = i; + *vec_fload = i + 0.5; + ntuple->Fill(); + } + + auto modelUpdater2 = ntuple->CreateModelUpdater(); + modelUpdater2->BeginUpdate(); + auto intvec_field = modelUpdater2->MakeField>("intvec_field"); + modelUpdater2->CommitUpdate(); + + for (int i = 0; i < 200; i++) { + *int_field = i; + *vec_fload = i + 0.5; + *intvec_field = {i, i + 1}; + ntuple->Fill(); + } +} diff --git a/dev/make-root/rntuple_index_multicluster.C b/dev/make-root/rntuple_index_multicluster.C index 5f317c3..8750c54 100644 --- a/dev/make-root/rntuple_index_multicluster.C +++ b/dev/make-root/rntuple_index_multicluster.C @@ -16,11 +16,11 @@ using RNTupleWriteOptions = ROOT::Experimental::RNTupleWriteOptions; void rntuple_index_multicluster() { auto options = RNTupleWriteOptions(); - options.SetApproxUnzippedPageSize(512); + options.SetMaxUnzippedPageSize(512); options.SetApproxZippedClusterSize(1000); options.SetMaxUnzippedClusterSize(1024); - std::string rootFileName{"test_ntuple_index_multicluster.root"}; + std::string rootFileName{"test_index_multicluster_rntuple_v1-0-0-0.root"}; auto model = RNTupleModel::Create(); auto int_vector = model->MakeField>("int_vector"); auto ntuple = diff --git a/dev/make-root/rntuple_int_5e4.C b/dev/make-root/rntuple_int_5e4.C index be0cfd4..5b9897b 100644 --- a/dev/make-root/rntuple_int_5e4.C +++ b/dev/make-root/rntuple_int_5e4.C @@ -7,13 +7,14 @@ R__LOAD_LIBRARY(ROOTNTuple) #include #include #include +#include #include using RNTupleModel = ROOT::Experimental::RNTupleModel; using RNTupleWriter = ROOT::Experimental::RNTupleWriter; void rntuple_int_5e4() { - std::string rootFileName{"test_ntuple_int_5e4.root"}; + std::string rootFileName{"test_int_5e4_rntuple_v1-0-0-0.root"}; auto model = RNTupleModel::Create(); auto int_field = model->MakeField("one_integers"); auto ntuple = diff --git a/dev/make-root/rntuple_int_float.C b/dev/make-root/rntuple_int_float.C index 943a2d5..27e83d1 100644 --- a/dev/make-root/rntuple_int_float.C +++ b/dev/make-root/rntuple_int_float.C @@ -3,13 +3,14 @@ R__LOAD_LIBRARY(ROOTNTuple) #include #include #include +#include #include using RNTupleModel = ROOT::Experimental::RNTupleModel; using RNTupleWriter = ROOT::Experimental::RNTupleWriter; void rntuple_int_float() { - std::string rootFileName{"test_ntuple_int_float.root"}; + std::string rootFileName{"test_int_float_rntuple_v1-0-0-0.root"}; auto model = RNTupleModel::Create(); auto int_field = model->MakeField("one_integers"); auto float_field = model->MakeField("two_floats"); diff --git a/dev/make-root/rntuple_int_multicluster.C b/dev/make-root/rntuple_int_multicluster.C index 7adf906..4c69acd 100644 --- a/dev/make-root/rntuple_int_multicluster.C +++ b/dev/make-root/rntuple_int_multicluster.C @@ -4,13 +4,14 @@ R__LOAD_LIBRARY(ROOTNTuple) #include #include #include +#include #include using RNTupleModel = ROOT::Experimental::RNTupleModel; using RNTupleWriter = ROOT::Experimental::RNTupleWriter; void rntuple_int_multicluster() { - std::string rootFileName{"test_ntuple_int_multicluster.root"}; + std::string rootFileName{"test_int_multicluster_rntuple_v1-0-0-0.root"}; auto model = RNTupleModel::Create(); auto int_field = model->MakeField("one_integers"); auto ntuple = diff --git a/dev/make-root/rntuple_int_vfloat_tlv_vtlv.C b/dev/make-root/rntuple_int_vfloat_tlv_vtlv.C index 4466ab2..d1d6dd3 100644 --- a/dev/make-root/rntuple_int_vfloat_tlv_vtlv.C +++ b/dev/make-root/rntuple_int_vfloat_tlv_vtlv.C @@ -4,6 +4,7 @@ R__LOAD_LIBRARY(ROOTNTuple) #include #include #include +#include #include using RNTupleModel = ROOT::Experimental::RNTupleModel; @@ -17,7 +18,7 @@ struct LV{ }; void rntuple_int_vfloat_tlv_vtlv() { - std::string rootFileName{"test_ntuple_int_vfloat_tlv_vtlv.root"}; + std::string rootFileName{"test_int_vfloat_tlv_vtlv_rntuple_v1-0-0-0.root"}; auto model = RNTupleModel::Create(); auto int_field = model->MakeField("one_integers"); auto v_float_field = model->MakeField>("two_v_floats"); diff --git a/dev/make-root/rntuple_nested_structs.C b/dev/make-root/rntuple_nested_structs.C new file mode 100644 index 0000000..907d94c --- /dev/null +++ b/dev/make-root/rntuple_nested_structs.C @@ -0,0 +1,46 @@ +/* https://root.cern/doc/master/ntpl001__staff_8C.html */ +R__LOAD_LIBRARY(ROOTNTuple) +#include +#include +#include +#include +#include + +#include +#include + +using RNTupleModel = ROOT::Experimental::RNTupleModel; +using RNTupleWriter = ROOT::Experimental::RNTupleWriter; + +struct SubSubSruct { + int i; + std::vector v; +}; + +struct SubStruct { + int i; + SubSubSruct sub_sub_struct; +}; + +struct TopStruct { + int i; + SubStruct sub_struct; +}; + +void rntuple_nested_structs() { + std::string rootFileName{"test_nested_structs_rntuple_v1-0-0-0.root"}; + auto model = RNTupleModel::Create(); + auto struct_field = model->MakeField("my_struct"); + auto ntuple = + RNTupleWriter::Recreate(std::move(model), "ntuple", rootFileName); + + + *struct_field = TopStruct(); + for (int i = 0; i < 10; i++) { + struct_field->i = i; + struct_field->sub_struct.i = i + 1; + struct_field->sub_struct.sub_sub_struct.i = i + 2; + struct_field->sub_struct.sub_sub_struct.v = {i, i + 1}; + ntuple->Fill(); + } +} diff --git a/dev/make-root/rntuple_split_3e4.C b/dev/make-root/rntuple_split_3e4.C index ae8771a..175ee22 100644 --- a/dev/make-root/rntuple_split_3e4.C +++ b/dev/make-root/rntuple_split_3e4.C @@ -5,13 +5,14 @@ R__LOAD_LIBRARY(ROOTNTuple) #include #include #include +#include #include using RNTupleModel = ROOT::Experimental::RNTupleModel; using RNTupleWriter = ROOT::Experimental::RNTupleWriter; void rntuple_split_3e4() { - std::string rootFileName{"test_ntuple_split_3e4.root"}; + std::string rootFileName{"test_split_3e4_rntuple_v1-0-0-0.root"}; auto model = RNTupleModel::Create(); auto splitint_field = model->MakeField("one_int32"); auto splitint_field2 = model->MakeField("two_uint32"); diff --git a/dev/make-root/rntuple_stl_containers.C b/dev/make-root/rntuple_stl_containers.C index ca8e027..44873d6 100644 --- a/dev/make-root/rntuple_stl_containers.C +++ b/dev/make-root/rntuple_stl_containers.C @@ -6,6 +6,7 @@ R__LOAD_LIBRARY(ROOTNTuple) #include #include #include +#include #include using RNTupleModel = ROOT::Experimental::RNTupleModel; @@ -25,7 +26,7 @@ struct LV{ }; void rntuple_stl_containers() { - std::string rootFileName{"test_ntuple_stl_containers.root"}; + std::string rootFileName{"test_stl_containers_rntuple_v1-0-0-0.root"}; auto model = RNTupleModel::Create(); auto string = model->MakeField("string"); auto vector_int32 = model->MakeField>("vector_int32"); diff --git a/dev/make-root/test_ntuple_extension_columns.md b/dev/make-root/test_ntuple_extension_columns.md deleted file mode 100644 index f958f91..0000000 --- a/dev/make-root/test_ntuple_extension_columns.md +++ /dev/null @@ -1,14 +0,0 @@ -1. Checkout an Athena build with ROOT nightly (currently has RNTuple RC2) -2. Get an ATLAS RAW file -3. Run reco: -```bash -Reco_tf.py \ - --CA="True" \ - --maxEvents=40 \ - --multithreaded="True" \ - --sharedWriter="True" \ - --parallelCompression="False" \ - --inputBSFile="raw.root" \ - --outputDAOD_TLAFile="daod_tla.root" \ - --preExec="flags.Output.StorageTechnology.EventData=\"ROOTRNTUPLE\""; -``` diff --git a/src/skhep_testdata/data/DAOD_TRUTH3_RC2.root b/src/skhep_testdata/data/DAOD_TRUTH3_RC2.root deleted file mode 100644 index 2456e57..0000000 Binary files a/src/skhep_testdata/data/DAOD_TRUTH3_RC2.root and /dev/null differ diff --git a/src/skhep_testdata/data/Run2012BC_DoubleMuParked_Muons_rntuple_1000evts.root b/src/skhep_testdata/data/Run2012BC_DoubleMuParked_Muons_1000evts_rntuple_v1-0-0-0.root similarity index 86% rename from src/skhep_testdata/data/Run2012BC_DoubleMuParked_Muons_rntuple_1000evts.root rename to src/skhep_testdata/data/Run2012BC_DoubleMuParked_Muons_1000evts_rntuple_v1-0-0-0.root index d90d829..6e49bd2 100644 Binary files a/src/skhep_testdata/data/Run2012BC_DoubleMuParked_Muons_rntuple_1000evts.root and b/src/skhep_testdata/data/Run2012BC_DoubleMuParked_Muons_1000evts_rntuple_v1-0-0-0.root differ diff --git a/src/skhep_testdata/data/ntpl001_staff_rntuple_v1-0-0-0.root b/src/skhep_testdata/data/ntpl001_staff_rntuple_v1-0-0-0.root new file mode 100644 index 0000000..a046069 Binary files /dev/null and b/src/skhep_testdata/data/ntpl001_staff_rntuple_v1-0-0-0.root differ diff --git a/src/skhep_testdata/data/test_1jag_int_float_rntuple_v1-0-0-0.root b/src/skhep_testdata/data/test_1jag_int_float_rntuple_v1-0-0-0.root new file mode 100644 index 0000000..7afea5d Binary files /dev/null and b/src/skhep_testdata/data/test_1jag_int_float_rntuple_v1-0-0-0.root differ diff --git a/src/skhep_testdata/data/test_atomic_bitset_rntuple_v1-0-0-0.root b/src/skhep_testdata/data/test_atomic_bitset_rntuple_v1-0-0-0.root new file mode 100644 index 0000000..88c6d85 Binary files /dev/null and b/src/skhep_testdata/data/test_atomic_bitset_rntuple_v1-0-0-0.root differ diff --git a/src/skhep_testdata/data/test_bit_rntuple_v1-0-0-0.root b/src/skhep_testdata/data/test_bit_rntuple_v1-0-0-0.root new file mode 100644 index 0000000..75492c7 Binary files /dev/null and b/src/skhep_testdata/data/test_bit_rntuple_v1-0-0-0.root differ diff --git a/src/skhep_testdata/data/test_emptystruct_invalidvar_rntuple_v1-0-0-0.root b/src/skhep_testdata/data/test_emptystruct_invalidvar_rntuple_v1-0-0-0.root new file mode 100644 index 0000000..bbc90e0 Binary files /dev/null and b/src/skhep_testdata/data/test_emptystruct_invalidvar_rntuple_v1-0-0-0.root differ diff --git a/src/skhep_testdata/data/test_extension_columns_rntuple_v1-0-0-0.root b/src/skhep_testdata/data/test_extension_columns_rntuple_v1-0-0-0.root new file mode 100644 index 0000000..7939c1d Binary files /dev/null and b/src/skhep_testdata/data/test_extension_columns_rntuple_v1-0-0-0.root differ diff --git a/src/skhep_testdata/data/test_index_multicluster_rntuple_v1-0-0-0.root b/src/skhep_testdata/data/test_index_multicluster_rntuple_v1-0-0-0.root new file mode 100644 index 0000000..be43f53 Binary files /dev/null and b/src/skhep_testdata/data/test_index_multicluster_rntuple_v1-0-0-0.root differ diff --git a/src/skhep_testdata/data/test_int_5e4_rntuple_v1-0-0-0.root b/src/skhep_testdata/data/test_int_5e4_rntuple_v1-0-0-0.root new file mode 100644 index 0000000..ae17969 Binary files /dev/null and b/src/skhep_testdata/data/test_int_5e4_rntuple_v1-0-0-0.root differ diff --git a/src/skhep_testdata/data/test_int_float_rntuple_v1-0-0-0.root b/src/skhep_testdata/data/test_int_float_rntuple_v1-0-0-0.root new file mode 100644 index 0000000..4b3aa59 Binary files /dev/null and b/src/skhep_testdata/data/test_int_float_rntuple_v1-0-0-0.root differ diff --git a/src/skhep_testdata/data/test_int_multicluster_rntuple_v1-0-0-0.root b/src/skhep_testdata/data/test_int_multicluster_rntuple_v1-0-0-0.root new file mode 100644 index 0000000..a5fe9af Binary files /dev/null and b/src/skhep_testdata/data/test_int_multicluster_rntuple_v1-0-0-0.root differ diff --git a/src/skhep_testdata/data/test_int_vfloat_tlv_vtlv_rntuple_v1-0-0-0.root b/src/skhep_testdata/data/test_int_vfloat_tlv_vtlv_rntuple_v1-0-0-0.root new file mode 100644 index 0000000..d1f1d71 Binary files /dev/null and b/src/skhep_testdata/data/test_int_vfloat_tlv_vtlv_rntuple_v1-0-0-0.root differ diff --git a/src/skhep_testdata/data/test_nested_structs_rntuple_v1-0-0-0.root b/src/skhep_testdata/data/test_nested_structs_rntuple_v1-0-0-0.root new file mode 100644 index 0000000..c95a717 Binary files /dev/null and b/src/skhep_testdata/data/test_nested_structs_rntuple_v1-0-0-0.root differ diff --git a/src/skhep_testdata/data/test_ntuple_1jag_int_float.root b/src/skhep_testdata/data/test_ntuple_1jag_int_float.root deleted file mode 100644 index 44999e3..0000000 Binary files a/src/skhep_testdata/data/test_ntuple_1jag_int_float.root and /dev/null differ diff --git a/src/skhep_testdata/data/test_ntuple_atomic_bitset.root b/src/skhep_testdata/data/test_ntuple_atomic_bitset.root deleted file mode 100644 index 6ca24dc..0000000 Binary files a/src/skhep_testdata/data/test_ntuple_atomic_bitset.root and /dev/null differ diff --git a/src/skhep_testdata/data/test_ntuple_bit.root b/src/skhep_testdata/data/test_ntuple_bit.root deleted file mode 100644 index 65e40f0..0000000 Binary files a/src/skhep_testdata/data/test_ntuple_bit.root and /dev/null differ diff --git a/src/skhep_testdata/data/test_ntuple_emptystruct_invalidvar.root b/src/skhep_testdata/data/test_ntuple_emptystruct_invalidvar.root deleted file mode 100644 index 4d06ed1..0000000 Binary files a/src/skhep_testdata/data/test_ntuple_emptystruct_invalidvar.root and /dev/null differ diff --git a/src/skhep_testdata/data/test_ntuple_extension_columns.root b/src/skhep_testdata/data/test_ntuple_extension_columns.root deleted file mode 100644 index 7ca3f16..0000000 Binary files a/src/skhep_testdata/data/test_ntuple_extension_columns.root and /dev/null differ diff --git a/src/skhep_testdata/data/test_ntuple_index_multicluster.root b/src/skhep_testdata/data/test_ntuple_index_multicluster.root deleted file mode 100644 index 43e1418..0000000 Binary files a/src/skhep_testdata/data/test_ntuple_index_multicluster.root and /dev/null differ diff --git a/src/skhep_testdata/data/test_ntuple_int_5e4.root b/src/skhep_testdata/data/test_ntuple_int_5e4.root deleted file mode 100644 index 1e0050b..0000000 Binary files a/src/skhep_testdata/data/test_ntuple_int_5e4.root and /dev/null differ diff --git a/src/skhep_testdata/data/test_ntuple_int_float.root b/src/skhep_testdata/data/test_ntuple_int_float.root deleted file mode 100644 index 6503502..0000000 Binary files a/src/skhep_testdata/data/test_ntuple_int_float.root and /dev/null differ diff --git a/src/skhep_testdata/data/test_ntuple_int_multicluster.root b/src/skhep_testdata/data/test_ntuple_int_multicluster.root deleted file mode 100644 index 1c37af4..0000000 Binary files a/src/skhep_testdata/data/test_ntuple_int_multicluster.root and /dev/null differ diff --git a/src/skhep_testdata/data/test_ntuple_int_vfloat_tlv_vtlv.root b/src/skhep_testdata/data/test_ntuple_int_vfloat_tlv_vtlv.root deleted file mode 100644 index 018fef5..0000000 Binary files a/src/skhep_testdata/data/test_ntuple_int_vfloat_tlv_vtlv.root and /dev/null differ diff --git a/src/skhep_testdata/data/test_ntuple_split_3e4.root b/src/skhep_testdata/data/test_ntuple_split_3e4.root deleted file mode 100644 index daac190..0000000 Binary files a/src/skhep_testdata/data/test_ntuple_split_3e4.root and /dev/null differ diff --git a/src/skhep_testdata/data/test_ntuple_stl_containers.root b/src/skhep_testdata/data/test_ntuple_stl_containers.root deleted file mode 100644 index 7a4da98..0000000 Binary files a/src/skhep_testdata/data/test_ntuple_stl_containers.root and /dev/null differ diff --git a/src/skhep_testdata/data/test_split_3e4_rntuple_v1-0-0-0.root b/src/skhep_testdata/data/test_split_3e4_rntuple_v1-0-0-0.root new file mode 100644 index 0000000..d1a6c62 Binary files /dev/null and b/src/skhep_testdata/data/test_split_3e4_rntuple_v1-0-0-0.root differ diff --git a/src/skhep_testdata/data/test_stl_containers_rntuple_v1-0-0-0.root b/src/skhep_testdata/data/test_stl_containers_rntuple_v1-0-0-0.root new file mode 100644 index 0000000..4ba3cbd Binary files /dev/null and b/src/skhep_testdata/data/test_stl_containers_rntuple_v1-0-0-0.root differ diff --git a/src/skhep_testdata/data/uproot-ntpl001_staff.root b/src/skhep_testdata/data/uproot-ntpl001_staff.root deleted file mode 100644 index 42d0f50..0000000 Binary files a/src/skhep_testdata/data/uproot-ntpl001_staff.root and /dev/null differ