diff --git a/python/tests/test_RawFile.py b/python/tests/test_RawFile.py index 69e4d46..5edfa84 100644 --- a/python/tests/test_RawFile.py +++ b/python/tests/test_RawFile.py @@ -5,9 +5,8 @@ import numpy as np @pytest.mark.files def test_read_rawfile_with_roi(test_data_path): - # Starting with f1 there is now 7 frames left in the series of files - with RawFile(test_data_path / "raw/SingleChipROI/Data_master_0.json") as f: - headers, frames = f.read() + with RawFile(test_data_path / "raw/SingleChipROI/Data_master_0.json") as f: + headers, frames = f.read() assert headers.size == 10100 assert frames.shape == (10100, 256, 256) diff --git a/src/RawMasterFile.cpp b/src/RawMasterFile.cpp index f6ef268..f12b7e0 100644 --- a/src/RawMasterFile.cpp +++ b/src/RawMasterFile.cpp @@ -1,6 +1,8 @@ #include "aare/RawMasterFile.hpp" #include "aare/RawFile.hpp" +#include "aare/logger.hpp" #include + namespace aare { RawFileNameComponents::RawFileNameComponents( @@ -425,9 +427,9 @@ void RawMasterFile::parse_raw(const std::filesystem::path &fpath) { if (m_geometry.col == 0 && m_geometry.row == 0) { retrieve_geometry(); - fmt::print("Warning: No geometry found in master file. Retrieved " - "geometry of {}x{}\n", - m_geometry.row, m_geometry.col); + LOG(TLogLevel::logWARNING) + << "No geometry found in master file. Retrieved geometry of " + << m_geometry.row << " x " << m_geometry.col << "\n "; } // TODO! Read files and find actual frames