detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2025-06-14 08:17:13 +02:00
Code Issues Actions Packages Releases Activity

fix merge errors

Browse Source
This commit is contained in:
Bechir
2024-03-08 18:42:24 +01:00
parent 565cad0fca
commit 5173f26bf8
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/include/aare/Frame.hpp
View File

@ -18,13 +18,8 @@ template <class DataType> class Frame {
DataType *m_data; DataType *m_data;
ssize_t m_bitdepth = sizeof(DataType) * 8; ssize_t m_bitdepth = sizeof(DataType) * 8;
public: public:
ssize_t rows;
ssize_t cols;
DataType* data;
ssize_t bitdepth = sizeof(DataType)*8;
Frame(ssize_t rows, ssize_t cols); Frame(ssize_t rows, ssize_t cols);
Frame(std::byte *fp, ssize_t rows, ssize_t cols); Frame(std::byte *fp, ssize_t rows, ssize_t cols);
DataType get(int row, int col); DataType get(int row, int col);
ssize_t rows() const{ ssize_t rows() const{
@ -36,6 +31,9 @@ template <class DataType> class Frame {
ssize_t bitdepth() const{ ssize_t bitdepth() const{
return m_bitdepth; return m_bitdepth;
} }
DataType* _get_data(){
return m_data;
}
~Frame() { delete[] m_data; } ~Frame() { delete[] m_data; }
}; };

4
core/src/Frame.cpp
View File

@ -10,8 +10,8 @@ Frame<DataType>::Frame(std::byte* bytes, ssize_t rows, ssize_t cols):
template <typename DataType> template <typename DataType>
Frame<DataType>::Frame(ssize_t rows, ssize_t cols): Frame<DataType>::Frame(ssize_t rows, ssize_t cols):
rows(rows), cols(cols) { m_rows(rows), m_cols(cols) {
data = new DataType[rows*cols]; m_data = new DataType[m_rows*m_cols];
} }

2
file_io/src/NumpyFile.cpp
View File

@ -17,7 +17,7 @@ Frame<DataType> *NumpyFile<detector, DataType>::get_frame(int frame_number) {
} }
Frame<DataType> *frame = new Frame<DataType>(header.shape[1], header.shape[2]); Frame<DataType> *frame = new Frame<DataType>(header.shape[1], header.shape[2]);
fseek(fp, header_size + frame_number * bytes_per_frame(), SEEK_SET); fseek(fp, header_size + frame_number * bytes_per_frame(), SEEK_SET);
fread(frame->data, sizeof(DataType), pixels_per_frame(), fp); fread(frame->_get_data(), sizeof(DataType), pixels_per_frame(), fp);
return frame; return frame;
} }

4
file_io/src/NumpyFileFactory.cpp
View File

@ -2,7 +2,7 @@
template <DetectorType detector, typename DataType> template <DetectorType detector, typename DataType>
NumpyFileFactory<detector, DataType>::NumpyFileFactory(std::filesystem::path fpath) { NumpyFileFactory<detector, DataType>::NumpyFileFactory(std::filesystem::path fpath) {
this->fpath = fpath; this->m_fpath = fpath;
} }
inline std::string parse_str(const std::string &in) { inline std::string parse_str(const std::string &in) {
if ((in.front() == '\'') && (in.back() == '\'')) if ((in.front() == '\'') && (in.back() == '\''))
@ -213,7 +213,7 @@ void NumpyFileFactory<detector, DataType>::parse_metadata(File<detector, DataTyp
template <DetectorType detector, typename DataType> template <DetectorType detector, typename DataType>
File<detector, DataType>* NumpyFileFactory<detector, DataType>::load_file() { File<detector, DataType>* NumpyFileFactory<detector, DataType>::load_file() {
NumpyFile<detector, DataType> *file = new NumpyFile<detector, DataType>(this->fpath); NumpyFile<detector, DataType> *file = new NumpyFile<detector, DataType>(this->m_fpath);
parse_metadata(file); parse_metadata(file);
NumpyFile<detector, DataType> *f = dynamic_cast<NumpyFile<detector, DataType> *>(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: " << f->header.to_string() << std::endl;