Skip to content

Commit

Permalink
Specify full RNTuple version
Browse files Browse the repository at this point in the history
  • Loading branch information
ariostas committed Nov 19, 2024
1 parent 3b8973c commit be3a66e
Show file tree
Hide file tree
Showing 42 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion dev/make-root/rntuple_1jag_int_float.C
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ using RNTupleModel = ROOT::Experimental::RNTupleModel;
using RNTupleWriter = ROOT::Experimental::RNTupleWriter;

void rntuple_1jag_int_float() {
std::string rootFileName{"test_1jag_int_float_rntuple_v1.root"};
std::string rootFileName{"test_1jag_int_float_rntuple_v1-0-0-0.root"};
auto model = RNTupleModel::Create();
auto v_int = model->MakeField<std::vector<int>>("one_v_integers");
auto v_float = model->MakeField<std::vector<float>>("two_v_floats");
Expand Down
Original file line number Diff line number Diff line change
@@ -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_1000evts_rntuple_v1.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()
Expand Down
2 changes: 1 addition & 1 deletion dev/make-root/rntuple_atomic_bitset.C
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ using RNTupleModel = ROOT::Experimental::RNTupleModel;
using RNTupleWriter = ROOT::Experimental::RNTupleWriter;

void rntuple_atomic_bitset() {
std::string rootFileName{"test_atomic_bitset_rntuple_v1.root"};
std::string rootFileName{"test_atomic_bitset_rntuple_v1-0-0-0.root"};
auto model = RNTupleModel::Create();
auto atomic_int_field = model->MakeField<std::atomic<int>>("atomic_int");
auto bitset_field = model->MakeField<std::bitset<42>>("bitset");
Expand Down
2 changes: 1 addition & 1 deletion dev/make-root/rntuple_bit.C
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ using RNTupleModel = ROOT::Experimental::RNTupleModel;
using RNTupleWriter = ROOT::Experimental::RNTupleWriter;

void rntuple_bit() {
std::string rootFileName{"test_bit_rntuple_v1.root"};
std::string rootFileName{"test_bit_rntuple_v1-0-0-0.root"};
auto model = RNTupleModel::Create();
auto bit_field = model->MakeField<bool>("one_bit");
auto ntuple =
Expand Down
2 changes: 1 addition & 1 deletion dev/make-root/rntuple_emptystruct_invalidvar.C
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct StructForVariant {
};

void rntuple_emptystruct_invalidvar() {
std::string rootFileName{"test_emptystruct_invalidvar_rntuple_v1.root"};
std::string rootFileName{"test_emptystruct_invalidvar_rntuple_v1-0-0-0.root"};
auto model = RNTupleModel::Create();
auto empty_struct_field = model->MakeField<EmptyStruct>("empty_struct");
auto variant_field = model->MakeField<std::variant<int,StructForVariant>>("variant");
Expand Down
2 changes: 1 addition & 1 deletion dev/make-root/rntuple_extension_columns.C
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void rntuple_extension_columns() {
options.SetApproxZippedClusterSize(2000);
options.SetMaxUnzippedClusterSize(2000);

std::string rootFileName{"test_extension_columns_rntuple_v1.root"};
std::string rootFileName{"test_extension_columns_rntuple_v1-0-0-0.root"};
auto model = RNTupleModel::Create();
auto int_field = model->MakeField<int>("int_field");

Expand Down
2 changes: 1 addition & 1 deletion dev/make-root/rntuple_index_multicluster.C
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void rntuple_index_multicluster() {
options.SetApproxZippedClusterSize(1000);
options.SetMaxUnzippedClusterSize(1024);

std::string rootFileName{"test_index_multicluster_rntuple_v1.root"};
std::string rootFileName{"test_index_multicluster_rntuple_v1-0-0-0.root"};
auto model = RNTupleModel::Create();
auto int_vector = model->MakeField<std::vector<int16_t>>("int_vector");
auto ntuple =
Expand Down
2 changes: 1 addition & 1 deletion dev/make-root/rntuple_int_5e4.C
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ using RNTupleModel = ROOT::Experimental::RNTupleModel;
using RNTupleWriter = ROOT::Experimental::RNTupleWriter;

void rntuple_int_5e4() {
std::string rootFileName{"test_int_5e4_rntuple_v1.root"};
std::string rootFileName{"test_int_5e4_rntuple_v1-0-0-0.root"};
auto model = RNTupleModel::Create();
auto int_field = model->MakeField<int>("one_integers");
auto ntuple =
Expand Down
2 changes: 1 addition & 1 deletion dev/make-root/rntuple_int_float.C
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ using RNTupleModel = ROOT::Experimental::RNTupleModel;
using RNTupleWriter = ROOT::Experimental::RNTupleWriter;

void rntuple_int_float() {
std::string rootFileName{"test_int_float_rntuple_v1.root"};
std::string rootFileName{"test_int_float_rntuple_v1-0-0-0.root"};
auto model = RNTupleModel::Create();
auto int_field = model->MakeField<int>("one_integers");
auto float_field = model->MakeField<float>("two_floats");
Expand Down
2 changes: 1 addition & 1 deletion dev/make-root/rntuple_int_multicluster.C
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ using RNTupleModel = ROOT::Experimental::RNTupleModel;
using RNTupleWriter = ROOT::Experimental::RNTupleWriter;

void rntuple_int_multicluster() {
std::string rootFileName{"test_int_multicluster_rntuple_v1.root"};
std::string rootFileName{"test_int_multicluster_rntuple_v1-0-0-0.root"};
auto model = RNTupleModel::Create();
auto int_field = model->MakeField<int16_t>("one_integers");
auto ntuple =
Expand Down
2 changes: 1 addition & 1 deletion dev/make-root/rntuple_int_vfloat_tlv_vtlv.C
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ struct LV{
};

void rntuple_int_vfloat_tlv_vtlv() {
std::string rootFileName{"test_int_vfloat_tlv_vtlv_rntuple_v1.root"};
std::string rootFileName{"test_int_vfloat_tlv_vtlv_rntuple_v1-0-0-0.root"};
auto model = RNTupleModel::Create();
auto int_field = model->MakeField<int>("one_integers");
auto v_float_field = model->MakeField<std::vector<float>>("two_v_floats");
Expand Down
2 changes: 1 addition & 1 deletion dev/make-root/rntuple_nested_structs.C
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct TopStruct {
};

void rntuple_nested_structs() {
std::string rootFileName{"test_nested_structs_rntuple_v1.root"};
std::string rootFileName{"test_nested_structs_rntuple_v1-0-0-0.root"};
auto model = RNTupleModel::Create();
auto struct_field = model->MakeField<TopStruct>("my_struct");
auto ntuple =
Expand Down
2 changes: 1 addition & 1 deletion dev/make-root/rntuple_split_3e4.C
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ using RNTupleModel = ROOT::Experimental::RNTupleModel;
using RNTupleWriter = ROOT::Experimental::RNTupleWriter;

void rntuple_split_3e4() {
std::string rootFileName{"test_split_3e4_rntuple_v1.root"};
std::string rootFileName{"test_split_3e4_rntuple_v1-0-0-0.root"};
auto model = RNTupleModel::Create();
auto splitint_field = model->MakeField<int32_t>("one_int32");
auto splitint_field2 = model->MakeField<uint32_t>("two_uint32");
Expand Down
2 changes: 1 addition & 1 deletion dev/make-root/rntuple_stl_containers.C
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ struct LV{
};

void rntuple_stl_containers() {
std::string rootFileName{"test_stl_containers_rntuple_v1.root"};
std::string rootFileName{"test_stl_containers_rntuple_v1-0-0-0.root"};
auto model = RNTupleModel::Create();
auto string = model->MakeField<std::string>("string");
auto vector_int32 = model->MakeField<std::vector<int32_t>>("vector_int32");
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed src/skhep_testdata/data/test_bit_rntuple_v1.root
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed src/skhep_testdata/data/test_int_5e4_rntuple_v1.root
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit be3a66e

Please sign in to comment.