linking to threads and removed extra ;

This commit is contained in:
Erik Fröjdh
2025-05-06 15:16:49 +02:00
parent 276283ff14
commit 1df26a4a06
5 changed files with 18 additions and 14 deletions

View File

@ -405,6 +405,9 @@ target_include_directories(aare_core PUBLIC
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>" "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
) )
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
target_link_libraries( target_link_libraries(
aare_core aare_core
PUBLIC PUBLIC
@ -413,6 +416,7 @@ target_link_libraries(
${STD_FS_LIB} # from helpers.cmake ${STD_FS_LIB} # from helpers.cmake
PRIVATE PRIVATE
aare_compiler_flags aare_compiler_flags
Threads::Threads
$<BUILD_INTERFACE:lmfit> $<BUILD_INTERFACE:lmfit>
) )

View File

@ -89,7 +89,7 @@ void JungfrauDataFile::seek(size_t frame_index) {
: frame_index; : frame_index;
auto byte_offset = frame_offset * (m_bytes_per_frame + header_size); auto byte_offset = frame_offset * (m_bytes_per_frame + header_size);
m_fp.seek(byte_offset); m_fp.seek(byte_offset);
}; }
size_t JungfrauDataFile::tell() { return m_current_frame_index; } size_t JungfrauDataFile::tell() { return m_current_frame_index; }
size_t JungfrauDataFile::total_frames() const { return m_total_frames; } size_t JungfrauDataFile::total_frames() const { return m_total_frames; }
@ -235,4 +235,4 @@ std::filesystem::path JungfrauDataFile::fpath(size_t file_index) const {
return m_path / fname; return m_path / fname;
} }
} // namespace aare } // namespace aare

View File

@ -72,8 +72,8 @@ void NumpyFile::get_frame_into(size_t frame_number, std::byte *image_buf) {
} }
} }
size_t NumpyFile::pixels_per_frame() { return m_pixels_per_frame; }; size_t NumpyFile::pixels_per_frame() { return m_pixels_per_frame; }
size_t NumpyFile::bytes_per_frame() { return m_bytes_per_frame; }; size_t NumpyFile::bytes_per_frame() { return m_bytes_per_frame; }
std::vector<Frame> NumpyFile::read_n(size_t n_frames) { std::vector<Frame> NumpyFile::read_n(size_t n_frames) {
// TODO: implement this in a more efficient way // TODO: implement this in a more efficient way
@ -197,4 +197,4 @@ void NumpyFile::load_metadata() {
m_header = {dtype, fortran_order, shape}; m_header = {dtype, fortran_order, shape};
} }
} // namespace aare } // namespace aare

View File

@ -34,7 +34,7 @@ RawFile::RawFile(const std::filesystem::path &fname, const std::string &mode)
} }
} }
Frame RawFile::read_frame() { return get_frame(m_current_frame++); }; Frame RawFile::read_frame() { return get_frame(m_current_frame++); }
Frame RawFile::read_frame(size_t frame_number) { Frame RawFile::read_frame(size_t frame_number) {
seek(frame_number); seek(frame_number);
@ -52,13 +52,13 @@ void RawFile::read_into(std::byte *image_buf, size_t n_frames) {
void RawFile::read_into(std::byte *image_buf) { void RawFile::read_into(std::byte *image_buf) {
return get_frame_into(m_current_frame++, image_buf); return get_frame_into(m_current_frame++, image_buf);
}; }
void RawFile::read_into(std::byte *image_buf, DetectorHeader *header) { void RawFile::read_into(std::byte *image_buf, DetectorHeader *header) {
return get_frame_into(m_current_frame++, image_buf, header); return get_frame_into(m_current_frame++, image_buf, header);
}; }
void RawFile::read_into(std::byte *image_buf, size_t n_frames, DetectorHeader *header) { void RawFile::read_into(std::byte *image_buf, size_t n_frames, DetectorHeader *header) {
// return get_frame_into(m_current_frame++, image_buf, header); // return get_frame_into(m_current_frame++, image_buf, header);
@ -70,7 +70,7 @@ void RawFile::read_into(std::byte *image_buf, size_t n_frames, DetectorHeader *h
header+=n_mod(); header+=n_mod();
} }
}; }
size_t RawFile::n_mod() const { return n_subfile_parts; } size_t RawFile::n_mod() const { return n_subfile_parts; }
@ -94,9 +94,9 @@ void RawFile::seek(size_t frame_index) {
frame_index, total_frames())); frame_index, total_frames()));
} }
m_current_frame = frame_index; m_current_frame = frame_index;
}; }
size_t RawFile::tell() { return m_current_frame; }; size_t RawFile::tell() { return m_current_frame; }
size_t RawFile::total_frames() const { return m_master.frames_in_file(); } size_t RawFile::total_frames() const { return m_master.frames_in_file(); }
size_t RawFile::rows() const { return m_geometry.pixels_y; } size_t RawFile::rows() const { return m_geometry.pixels_y; }
@ -360,4 +360,4 @@ RawFile::~RawFile() {
} // namespace aare } // namespace aare

View File

@ -87,7 +87,7 @@ int ScanParameters::start() const { return m_start; }
int ScanParameters::stop() const { return m_stop; } int ScanParameters::stop() const { return m_stop; }
void ScanParameters::increment_stop(){ void ScanParameters::increment_stop(){
m_stop += 1; m_stop += 1;
}; }
int ScanParameters::step() const { return m_step; } int ScanParameters::step() const { return m_step; }
const std::string &ScanParameters::dac() const { return m_dac; } const std::string &ScanParameters::dac() const { return m_dac; }
bool ScanParameters::enabled() const { return m_enabled; } bool ScanParameters::enabled() const { return m_enabled; }
@ -417,4 +417,4 @@ void RawMasterFile::parse_raw(const std::filesystem::path &fpath) {
if(m_frames_in_file==0) if(m_frames_in_file==0)
m_frames_in_file = m_total_frames_expected; m_frames_in_file = m_total_frames_expected;
} }
} // namespace aare } // namespace aare