detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2026-02-02 22:14:55 +01:00
Code Issues Actions Packages Releases Activity

compiler generated constructors and reduced warnings

Browse Source
This commit is contained in:
Erik Frojdh
2024-04-03 14:12:25 +02:00
parent 31a20d4f6c
commit b02feceb2c
6 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
file_io/src/NumpyFile.cpp
View File

@@ -12,7 +12,7 @@ NumpyFile::NumpyFile(const std::filesystem::path &fname) {
}
load_metadata();
}
NumpyFile::NumpyFile(FileConfig config, header_t header) {
NumpyFile::NumpyFile(FileConfig config, NumpyHeader header) {
mode = "w";
m_fname = config.fname;
m_bitdepth = config.dtype.bitdepth();

22
file_io/src/NumpyHelpers.cpp
View File

@@ -24,7 +24,20 @@
#include "aare/NumpyHelpers.hpp"
namespace aare::NumpyHelpers {
namespace aare{
std::string NumpyHeader::to_string() const{
std::stringstream sstm;
sstm << "dtype: " << dtype.str() << ", fortran_order: " << fortran_order << ' ';
sstm << "shape: (";
for (auto item : shape)
sstm << item << ',';
sstm << ')';
return sstm.str();
}
namespace NumpyHelpers {
std::unordered_map<std::string, std::string> parse_dict(std::string in, const std::vector<std::string> &keys) {
std::unordered_map<std::string, std::string> map;
@@ -209,12 +222,12 @@ inline std::string write_header_dict(const std::string &descr, bool fortran_orde
return "{'descr': '" + descr + "', 'fortran_order': " + s_fortran_order + ", 'shape': " + shape_s + ", }";
}
size_t write_header(std::filesystem::path fname, const header_t &header) {
size_t write_header(std::filesystem::path fname, const NumpyHeader &header) {
std::ofstream out(fname, std::ios::binary | std::ios::out);
return write_header(out, header);
}
size_t write_header(std::ostream &out, const header_t &header) {
size_t write_header(std::ostream &out, const NumpyHeader &header) {
std::string header_dict = write_header_dict(header.dtype.str(), header.fortran_order, header.shape);
size_t length = magic_string_length + 2 + 2 + header_dict.length() + 1;
@@ -252,4 +265,5 @@ size_t write_header(std::ostream &out, const header_t &header) {
return length;
}
} // namespace aare::NumpyHelpers
} // namespace NumpyHelpers
} // namespace aare