detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2026-02-18 21:28:40 +01:00
Code Issues Actions Packages Releases Activity

fixed tests

Browse Source
This commit is contained in:
Erik Fröjdh
2025-12-18 14:07:59 +01:00
parent a8225faa17
commit 28cdaa6c06
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/RawMasterFile.cpp
View File

@@ -71,7 +71,7 @@ ScanParameters::ScanParameters(const bool enabled, const DACIndex dac,
const int start, const int stop, const int step, const int start, const int stop, const int step,
const int64_t settleTime) const int64_t settleTime)
: m_enabled(enabled), m_dac(dac), m_start(start), m_stop(stop), : m_enabled(enabled), m_dac(dac), m_start(start), m_stop(stop),
m_step(step), m_settleTime(settleTime){}; m_step(step), m_settleTime(settleTime) {};
// "[enabled\ndac dac 4\nstart 500\nstop 2200\nstep 5\nsettleTime 100us\n]" // "[enabled\ndac dac 4\nstart 500\nstop 2200\nstep 5\nsettleTime 100us\n]"
ScanParameters::ScanParameters(const std::string &par) { ScanParameters::ScanParameters(const std::string &par) {
@@ -206,11 +206,20 @@ void RawMasterFile::parse_json(const std::filesystem::path &fpath) {
m_max_frames_per_file = j["Max Frames Per File"]; m_max_frames_per_file = j["Max Frames Per File"];
m_exptime = string_to<std::chrono::nanoseconds>( try {
j["Exptime"].get<std::string>()); if (v < 8.0) {
m_exptime = string_to<std::chrono::nanoseconds>(
j["Exptime"].get<std::string>());
} else {
m_exptime = string_to<std::chrono::nanoseconds>(
j["Exposure Time"].get<std::string>());
}
} catch (const json::out_of_range &e) {
// keep default 0, Mythen3 not supported yet
}
m_period = string_to<std::chrono::nanoseconds>( m_period =
j["Period"].get<std::string>()); string_to<std::chrono::nanoseconds>(j["Period"].get<std::string>());
// Not all detectors write the bitdepth but in case // Not all detectors write the bitdepth but in case
// its not there it is 16 // its not there it is 16
@@ -437,9 +446,9 @@ void RawMasterFile::parse_raw(const std::filesystem::path &fpath) {
m_pixels_x = std::stoi(value.substr(0, pos)); m_pixels_x = std::stoi(value.substr(0, pos));
} else if (key == "Total Frames") { } else if (key == "Total Frames") {
m_total_frames_expected = std::stoi(value); m_total_frames_expected = std::stoi(value);
} else if(key == "Exptime"){ } else if (key == "Exptime") {
m_exptime = string_to<std::chrono::nanoseconds>(value); m_exptime = string_to<std::chrono::nanoseconds>(value);
} else if(key == "Period"){ } else if (key == "Period") {
m_period = string_to<std::chrono::nanoseconds>(value); m_period = string_to<std::chrono::nanoseconds>(value);
} else if (key == "Dynamic Range") { } else if (key == "Dynamic Range") {
m_bitdepth = std::stoi(value); m_bitdepth = std::stoi(value);

4
src/RawMasterFile.test.cpp
View File

@@ -164,7 +164,7 @@ TEST_CASE("Parse a master file in .raw format", "[.integration]") {
auto fpath = auto fpath =
test_data_path() / test_data_path() /
"moench/" "raw/moench/"
"moench04_noise_200V_sto_both_100us_no_light_thresh_900_master_0.raw"; "moench04_noise_200V_sto_both_100us_no_light_thresh_900_master_0.raw";
REQUIRE(std::filesystem::exists(fpath)); REQUIRE(std::filesystem::exists(fpath));
RawMasterFile f(fpath); RawMasterFile f(fpath);
@@ -263,7 +263,7 @@ TEST_CASE("Parse a master file in new .json format",
} }
TEST_CASE("Read eiger master file", "[.integration]") { TEST_CASE("Read eiger master file", "[.integration]") {
auto fpath = test_data_path() / "eiger" / "eiger_500k_32bit_master_0.json"; auto fpath = test_data_path() / "raw/eiger/eiger_500k_32bit_master_0.json";
REQUIRE(std::filesystem::exists(fpath)); REQUIRE(std::filesystem::exists(fpath));
RawMasterFile f(fpath); RawMasterFile f(fpath);