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

changed RoMode to be consistent with slsdet

Browse Source
This commit is contained in:
mazzol_a
2026-02-03 17:16:15 +01:00
parent 6b4a2a6fb1
commit f5ea01d238
8 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/RawMasterFile.cpp
View File

@@ -195,27 +195,27 @@ ScanParameters RawMasterFile::scan_parameters() const {
std::optional<ROI> RawMasterFile::roi() const { return m_roi; }
ReadingMode RawMasterFile::get_reading_mode() const {
ReadoutMode RawMasterFile::get_reading_mode() const {
if (m_type != DetectorType::ChipTestBoard &&
m_type != DetectorType::Xilinx_ChipTestBoard) {
LOG(TLogLevel::logINFO)
<< "reading mode is only available for CTB detectors.";
return ReadingMode::Unknown;
return ReadoutMode::UNKNOWN;
}
if (m_analog_flag && m_digital_flag) {
return ReadingMode::AnalogAndDigital;
return ReadoutMode::ANALOG_AND_DIGITAL;
} else if (m_analog_flag) {
return ReadingMode::Analog;
return ReadoutMode::ANALOG_ONLY;
} else if (m_digital_flag && m_transceiver_flag) {
return ReadingMode::DigitalAndTransceiver;
return ReadoutMode::DIGITAL_AND_TRANSCEIVER;
} else if (m_digital_flag) {
return ReadingMode::Digital;
return ReadoutMode::DIGITAL_ONLY;
} else if (m_transceiver_flag) {
return ReadingMode::Transceiver;
return ReadoutMode::TRANSCEIVER_ONLY;
} else {
return ReadingMode::Unknown;
return ReadoutMode::UNKNOWN;
}
}

6
src/RawMasterFile.test.cpp
View File

@@ -147,7 +147,7 @@ TEST_CASE("Parse a master file in .json format", "[.integration]") {
REQUIRE_FALSE(f.analog_samples());
REQUIRE_FALSE(f.digital_samples());
REQUIRE(f.get_reading_mode() == ReadingMode::Unknown);
REQUIRE(f.get_reading_mode() == ReadoutMode::UNKNOWN);
}
TEST_CASE("Parse a master file in old .raw format",
@@ -213,7 +213,7 @@ TEST_CASE("Parse a master file in .raw format", "[.integration]") {
// Frames in File : 100
REQUIRE(f.frames_in_file() == 100);
REQUIRE(f.get_reading_mode() == ReadingMode::Unknown);
REQUIRE(f.get_reading_mode() == ReadoutMode::ANALOG_AND_DIGITAL);
// #Frame Header
// Frame Number : 8 bytes
@@ -564,7 +564,7 @@ TEST_CASE("Parse a CTB file from stream") {
REQUIRE(f.digital_samples() == std::nullopt); // Digital Flag is 0
REQUIRE(f.transceiver_samples() == 1152);
REQUIRE(f.frames_in_file() == 40);
REQUIRE(f.get_reading_mode() == ReadingMode::Transceiver);
REQUIRE(f.get_reading_mode() == ReadoutMode::TRANSCEIVER_ONLY);
}
TEST_CASE("Parse v8.0 MYTHEN3 from stream") {