mx/Jungfraujoch
2
1
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases 54 Wiki Activity

DiffractionExperiment: Move internal variables to a C++ structure

Browse Source
This commit is contained in:
leonarski_f
2023-11-14 11:54:51 +01:00
parent e85988dfa2
commit f778a35e6f
19 changed files with 490 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/DiffractionExperimentTest.cpp
+6 -6
View File
@@ -663,7 +663,7 @@ TEST_CASE("DiffractionExperiment_LoadDatasetSettings", "[DiffractionExperiment]"
REQUIRE(x.GetDataFileCount() == 5);
REQUIRE(x.GetDetectorDistance_mm() == Approx(57.6));
REQUIRE(x.GetSummation() == 36);
REQUIRE(x.GetFPGAOutputMode() == JFJochProtoBuf::INT16);
REQUIRE(x.GetFPGAOutputMode() == FPGAPixelOutput::Int16);
}
TEST_CASE("DiffractionExperiment_LoadDatasetSettings_Invalid", "[DiffractionExperiment]") {
@@ -782,7 +782,7 @@ TEST_CASE("DiffractionExperiment_FPGA_Summation_output","[DiffractionExperiment]
REQUIRE_THROWS(x.Summation(-1));
REQUIRE_THROWS(x.Summation(MAX_FPGA_SUMMATION + 1));
x.FPGAOutputMode(JFJochProtoBuf::AUTO);
x.FPGAOutputMode(FPGAPixelOutput::Auto);
REQUIRE_NOTHROW(x.Summation(1));
REQUIRE(x.IsPixelSigned());
REQUIRE(x.GetPixelDepth() == 2);
@@ -793,19 +793,19 @@ TEST_CASE("DiffractionExperiment_FPGA_Summation_output","[DiffractionExperiment]
REQUIRE(x.GetPixelDepth() == 4);
REQUIRE(x.GetSummation() == 3);
x.FPGAOutputMode(JFJochProtoBuf::INT16);
x.FPGAOutputMode(FPGAPixelOutput::Int16);
REQUIRE(x.GetPixelDepth() == 2);
REQUIRE(x.IsPixelSigned());
x.FPGAOutputMode(JFJochProtoBuf::INT32);
x.FPGAOutputMode(FPGAPixelOutput::Int32);
REQUIRE(x.GetPixelDepth() == 4);
REQUIRE(x.IsPixelSigned());
x.FPGAOutputMode(JFJochProtoBuf::UINT16);
x.FPGAOutputMode(FPGAPixelOutput::Uint16);
REQUIRE(x.GetPixelDepth() == 2);
REQUIRE(!x.IsPixelSigned());
x.FPGAOutputMode(JFJochProtoBuf::UINT32);
x.FPGAOutputMode(FPGAPixelOutput::Uint32);
REQUIRE(x.GetPixelDepth() == 4);
REQUIRE(!x.IsPixelSigned());
}