sf-daq/sf_daq_buffer
0
0
Fork 0
mirror of https://github.com/paulscherrerinstitute/sf_daq_buffer.git synced 2026-04-23 11:50:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Generalize create dataset

Browse Source
This commit is contained in:
babic_a
2018-12-04 17:21:36 +01:00
parent 7b75b52764
commit ea2020e5ce
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/H5Writer.cpp
+9 -5
View File
@@ -140,8 +140,8 @@ void H5Writer::write_data(const string& dataset_name, const size_t data_index, c
}
}
void H5Writer::create_chunked_dataset(const string& dataset_name, const vector<size_t>& data_shape,
const string& data_type, const string& endianness, hize_t max_dataset_size)
void H5Writer::create_dataset(const string& dataset_name, const vector<size_t>& data_shape,
const string& data_type, const string& endianness, bool chunked)
{
// Number of dimensions in each data point.
const size_t data_rank = data_shape.size();
@@ -152,6 +152,7 @@ void H5Writer::create_chunked_dataset(const string& dataset_name, const vector<s
hsize_t max_dataset_dimension[dataset_rank];
hsize_t dataset_chunking[dataset_rank];
// This should be equivalent to the total number of frames in this file.
dataset_dimension[0] = initial_dataset_size;
// This dataset can be resized without limits.
max_dataset_dimension[0] = H5S_UNLIMITED;
@@ -169,15 +170,18 @@ void H5Writer::create_chunked_dataset(const string& dataset_name, const vector<s
#ifdef DEBUG_OUTPUT
using namespace date;
cout << "[" << std::chrono::system_clock::now() << "]";
cout << "[H5Writer::create_chunked_dataset] Creating dataspace of size (";
cout << "[H5Writer::create_dataset] Creating dataspace of size (";
for (hsize_t i=0; i<dataset_rank; ++i) {
cout << dataset_dimension[i] << ",";
}
cout << ")" << endl;
#endif
// Create a chunked dataset if needed.
H5::DSetCreatPropList dataset_properties;
dataset_properties.setChunk(dataset_rank, dataset_chunking);
if (chunked) {
dataset_properties.setChunk(dataset_rank, dataset_chunking);
}
H5::AtomType dataset_data_type(H5FormatUtils::get_dataset_data_type(data_type));
@@ -287,7 +291,7 @@ hsize_t H5Writer::prepare_storage_for_data(const string& dataset_name, const siz
// Create the dataset if we don't have it yet.
if (datasets.find(dataset_name) == datasets.end()) {
create_chunked_dataset(dataset_name, data_shape, data_type, endianness);
create_dataset(dataset_name, data_shape, data_type, endianness, true);
}
hsize_t current_dataset_size = datasets_current_size.at(dataset_name);
lib/src/H5Writer.hpp
+4 -4
View File
@@ -28,8 +28,8 @@ class H5Writer
hsize_t prepare_storage_for_data(const std::string& dataset_name, const size_t data_index, const std::vector<size_t>& data_shape,
const std::string& data_type, const std::string& endianness);
void create_chunked_dataset(const std::string& dataset_name, const std::vector<size_t>& data_shape,
const std::string& data_type, const std::string& endianness);
void create_dataset(const std::string& dataset_name, const std::vector<size_t>& data_shape,
const std::string& data_type, const std::string& endianness, bool chunked);
size_t get_relative_data_index(const size_t data_index);
@@ -41,8 +41,8 @@ class H5Writer
virtual void close_file();
virtual void write_data(const std::string& dataset_name, const size_t data_index, const char* data, const std::vector<size_t>& data_shape,
const size_t data_bytes_size, const std::string& data_type, const std::string& endianness);
virtual void write_dataset(const std::string& dataset_name, const size_t data_index, const char* data, const std::vector<size_t>& data_shape,
const size_t data_bytes_size, const std::string& data_type, const std::string& endianness);
// virtual void write_dataset(const std::string& dataset_name, const size_t data_index, const char* data, const std::vector<size_t>& data_shape,
// const size_t data_bytes_size, const std::string& data_type, const std::string& endianness);
virtual H5::H5File& get_h5_file();
virtual bool is_data_for_current_file(const size_t data_index);