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

DiffractionExperiment: Rename GetFPGAOutputDepth -> GetPixelDepth and GetFPGASummation -> GetSummation

Browse Source
This commit is contained in:
leonarski_f
2023-11-06 18:01:53 +01:00
parent dec3eb15de
commit 591e724cf6
13 changed files with 173 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/DiffractionExperimentTest.cpp
+21 -21
View File
@@ -706,7 +706,7 @@ TEST_CASE("DiffractionExperiment_LoadDatasetSettings", "[DiffractionExperiment]"
settings.set_data_file_count(5);
settings.set_space_group_number(45);
settings.set_sample_name("lyso1");
settings.set_fpga_summation(36);
settings.set_summation(36);
settings.set_fpga_pixel_output(JFJochProtoBuf::INT16);
REQUIRE_NOTHROW(x.LoadDatasetSettings(settings));
@@ -718,7 +718,7 @@ TEST_CASE("DiffractionExperiment_LoadDatasetSettings", "[DiffractionExperiment]"
REQUIRE(x.GetSampleName() == "lyso1");
REQUIRE(x.GetDataFileCount() == 5);
REQUIRE(x.GetDetectorDistance_mm() == Approx(57.6));
REQUIRE(x.GetFPGASummation() == 36);
REQUIRE(x.GetSummation() == 36);
REQUIRE(x.GetFPGAOutputMode() == JFJochProtoBuf::INT16);
}
@@ -836,36 +836,36 @@ TEST_CASE("DiffractionExperiment_DefaultDataProcessingSettings","[DiffractionExp
TEST_CASE("DiffractionExperiment_FPGA_Summation_output","[DiffractionExperiment]") {
DiffractionExperiment x;
REQUIRE_THROWS(x.FPGASummation(0));
REQUIRE_THROWS(x.FPGASummation(-1));
REQUIRE_THROWS(x.FPGASummation(MAX_FPGA_SUMMATION + 1));
REQUIRE_THROWS(x.Summation(0));
REQUIRE_THROWS(x.Summation(-1));
REQUIRE_THROWS(x.Summation(MAX_FPGA_SUMMATION + 1));
x.FPGAOutputMode(JFJochProtoBuf::AUTO);
REQUIRE_NOTHROW(x.FPGASummation(1));
REQUIRE(x.GetFPGAOutputSigned());
REQUIRE(x.GetFPGAOutputDepth() == 2);
REQUIRE(x.GetFPGASummation() == 1);
REQUIRE_NOTHROW(x.Summation(1));
REQUIRE(x.IsPixelSigned());
REQUIRE(x.GetPixelDepth() == 2);
REQUIRE(x.GetSummation() == 1);
REQUIRE_NOTHROW(x.FPGASummation(3));
REQUIRE(x.GetFPGAOutputSigned());
REQUIRE(x.GetFPGAOutputDepth() == 4);
REQUIRE(x.GetFPGASummation() == 3);
REQUIRE_NOTHROW(x.Summation(3));
REQUIRE(x.IsPixelSigned());
REQUIRE(x.GetPixelDepth() == 4);
REQUIRE(x.GetSummation() == 3);
x.FPGAOutputMode(JFJochProtoBuf::INT16);
REQUIRE(x.GetFPGAOutputDepth() == 2);
REQUIRE(x.GetFPGAOutputSigned());
REQUIRE(x.GetPixelDepth() == 2);
REQUIRE(x.IsPixelSigned());
x.FPGAOutputMode(JFJochProtoBuf::INT32);
REQUIRE(x.GetFPGAOutputDepth() == 4);
REQUIRE(x.GetFPGAOutputSigned());
REQUIRE(x.GetPixelDepth() == 4);
REQUIRE(x.IsPixelSigned());
x.FPGAOutputMode(JFJochProtoBuf::UINT16);
REQUIRE(x.GetFPGAOutputDepth() == 2);
REQUIRE(!x.GetFPGAOutputSigned());
REQUIRE(x.GetPixelDepth() == 2);
REQUIRE(!x.IsPixelSigned());
x.FPGAOutputMode(JFJochProtoBuf::UINT32);
REQUIRE(x.GetFPGAOutputDepth() == 4);
REQUIRE(!x.GetFPGAOutputSigned());
REQUIRE(x.GetPixelDepth() == 4);
REQUIRE(!x.IsPixelSigned());
}
TEST_CASE("DiffractionExperiment_DetectorModuleHostname","[DiffractionExperiment]") {