Merge branch 'developer' into fix/open-files
All checks were successful
Build on RHEL9 / build (push) Successful in 2m15s
Build on RHEL8 / build (push) Successful in 2m35s

This commit is contained in:
Erik Fröjdh
2025-05-06 17:19:11 +02:00
committed by GitHub
14 changed files with 586 additions and 22 deletions

View File

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