detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2025-06-05 12:30:39 +02:00
Code Issues Actions Packages Releases Activity

fix warnings

Browse Source
This commit is contained in:
Bechir Braham 2024-03-12 17:21:05 +01:00
parent 609c754b23
commit 9380fd1be8
No known key found for this signature in database
GPG Key ID: 7F511B55FD8E9671
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
file_io/include/aare/File.hpp
View File

@ -12,7 +12,7 @@ template <DetectorType detector, typename DataType>
class File {
public:
virtual Frame<DataType>* get_frame(int frame_number) = 0;
virtual Frame<DataType>* get_frame(size_t frame_number) = 0;
private:
//comment

2
file_io/include/aare/JsonFile.hpp
View File

@ -9,7 +9,7 @@ template <DetectorType detector, typename DataType> class JsonFile : public File
using config = RawFileConfig;
public:
Frame<DataType> *get_frame(int frame_number);
Frame<DataType> *get_frame(size_t frame_number);
int n_subfiles;
std::vector<SubFile *> subfiles;
int subfile_rows, subfile_cols;

2
file_io/include/aare/NumpyFile.hpp
View File

@ -11,7 +11,7 @@ template <DetectorType detector, typename DataType> class NumpyFile : public Fil
public:
NumpyFile(std::filesystem::path fname);
Frame<DataType> *get_frame(int frame_number) override;
Frame<DataType> *get_frame(size_t frame_number) override;
header_t header{};
static constexpr std::array<char, 6> magic_str{'\x93', 'N', 'U', 'M', 'P', 'Y'};
uint8_t major_ver_{};

2
file_io/src/JsonFile.cpp
View File

@ -1,7 +1,7 @@
#include "aare/JsonFile.hpp"
template <DetectorType detector, typename DataType>
Frame<DataType> *JsonFile<detector, DataType>::get_frame(int frame_number) {
Frame<DataType> *JsonFile<detector, DataType>::get_frame(size_t frame_number) {
if (frame_number > this->total_frames) {
throw std::runtime_error("Frame number out of range");
}

8
file_io/src/NumpyFile.cpp
View File

@ -2,13 +2,13 @@
#include "aare/NumpyFile.hpp"
template <DetectorType detector, typename DataType>
NumpyFile<detector, DataType>::NumpyFile(std::filesystem::path fname){
this->fname = fname;
fp = fopen(fname.c_str(), "rb");
NumpyFile<detector, DataType>::NumpyFile(std::filesystem::path fname_){
this->fname = fname_;
fp = fopen(this->fname.c_str(), "rb");
}
template <DetectorType detector, typename DataType>
Frame<DataType> *NumpyFile<detector, DataType>::get_frame(int frame_number) {
Frame<DataType> *NumpyFile<detector, DataType>::get_frame(size_t frame_number) {
if (fp == nullptr) {
throw std::runtime_error("File not open");
}

7
file_io/src/NumpyFileFactory.cpp
View File

@ -78,12 +78,11 @@ template <DetectorType detector, typename DataType>
File<detector, DataType>* NumpyFileFactory<detector, DataType>::load_file() {
NumpyFile<detector, DataType> *file = new NumpyFile<detector, DataType>(this->m_fpath);
parse_metadata(file);
NumpyFile<detector, DataType> *f = dynamic_cast<NumpyFile<detector, DataType> *>(file);
std::cout << "parsed header: " << f->header.to_string() << std::endl;
std::cout << "parsed header: " << file->header.to_string() << std::endl;
if(sizeof(DataType) != f->header.dtype.itemsize){
if(sizeof(DataType) != file->header.dtype.itemsize){
std::stringstream s;
s << "Data type size mismatch: " << sizeof(DataType) << " != " << f->header.dtype.itemsize;
s << "Data type size mismatch: " << sizeof(DataType) << " != " << file->header.dtype.itemsize;
throw std::runtime_error(s.str());
}
return file;