Updates March 2023

This commit is contained in:
2024-03-14 20:26:03 +01:00
parent affb8d1380
commit 59aacf516d
59 changed files with 1637 additions and 792 deletions

View File

@@ -12,12 +12,6 @@ TEST_CASE("JFJochStateMachine_States") {
state_machine.AddDetectorSetup(DetectorGeometry(4));
DatasetSettings setup;
setup.ntrigger = 1;
setup.detector_distance_mm = 100;
setup.file_prefix = "integration_test";
setup.images_per_trigger = 5;
setup.photon_energy_keV = 12.4;
setup.data_file_count = 5;
JFJochState state;
REQUIRE_NOTHROW(state = state_machine.GetState());
@@ -43,12 +37,6 @@ TEST_CASE("JFJochStateMachine_State_Pedestal") {
state_machine.AddDetectorSetup(DetectorGeometry(4));
DatasetSettings setup;
setup.ntrigger = 1;
setup.detector_distance_mm = 100;
setup.file_prefix = "integration_test";
setup.images_per_trigger = 5;
setup.photon_energy_keV = 12.4;
setup.data_file_count = 5;
state_machine.DebugOnly_SetState(JFJochState::Pedestal);
@@ -74,12 +62,6 @@ TEST_CASE("JFJochStateMachine_State_Measure") {
state_machine.AddDetectorSetup(DetectorGeometry(4));
DatasetSettings setup;
setup.ntrigger = 1;
setup.detector_distance_mm = 100;
setup.file_prefix = "integration_test";
setup.images_per_trigger = 5;
setup.photon_energy_keV = 12.4;
setup.data_file_count = 5;
state_machine.DebugOnly_SetState(JFJochState::Measuring);
@@ -105,12 +87,6 @@ TEST_CASE("JFJochStateMachine_State_Error") {
state_machine.AddDetectorSetup(DetectorGeometry(4));
DatasetSettings setup;
setup.ntrigger = 1;
setup.detector_distance_mm = 100;
setup.file_prefix = "integration_test";
setup.images_per_trigger = 5;
setup.photon_energy_keV = 12.4;
setup.data_file_count = 5;
state_machine.DebugOnly_SetState(JFJochState::Error);
@@ -246,58 +222,6 @@ TEST_CASE("JFJochStateMachine_AddDetectorSetup_Multiple") {
REQUIRE(state_machine.GetState() == JFJochState::Inactive);
}
TEST_CASE("JFJochStateMachine_LoadDatasetSettings", "[DiffractionExperiment]") {
DiffractionExperiment x;
x.ImagesPerTrigger(567).BeamY_pxl(324).Compression(CompressionAlgorithm::BSHUF_ZSTD);
DatasetSettings settings{};
settings.images_per_trigger = 234;
settings.ntrigger = 56;
settings.beam_x_pxl = 23.4;
settings.beam_y_pxl = 123.4;
settings.photon_energy_keV = WVL_1A_IN_KEV;
settings.detector_distance_mm = 57.6;
settings.data_file_count = 5;
settings.space_group_number = 45;
settings.sample_name = "lyso1";
settings.summation = 36;
settings.fpga_pixel_output = FPGAPixelOutput::Int16;
settings.compression = CompressionAlgorithm::BSHUF_LZ4;
settings.photon_energy_multiplier = 1.0;
REQUIRE_NOTHROW(LoadDatasetSettings(x,settings));
REQUIRE(x.GetImageNumPerTrigger() == 234);
REQUIRE(x.GetBeamX_pxl() == Approx(23.4));
REQUIRE(x.GetBeamY_pxl() == Approx(123.4));
REQUIRE(x.GetSpaceGroupNumber() == 45);
REQUIRE(x.GetCompressionAlgorithm() == CompressionAlgorithm::BSHUF_LZ4);
REQUIRE(x.GetSampleName() == "lyso1");
REQUIRE(x.GetDataFileCount() == 5);
REQUIRE(x.GetDetectorDistance_mm() == Approx(57.6));
REQUIRE(x.GetSummation() == 36);
REQUIRE(x.GetFPGAOutputMode() == FPGAPixelOutput::Int16);
}
TEST_CASE("JFJochStateMachine_LoadDatasetSettings_Invalid", "[DiffractionExperiment]") {
DiffractionExperiment x;
x.ImagesPerTrigger(567).BeamY_pxl(324).Compression(CompressionAlgorithm::BSHUF_ZSTD);
DatasetSettings settings{};
settings.images_per_trigger = -1;
settings.ntrigger = 56;
settings.beam_x_pxl = 23.4;
settings.beam_y_pxl = 123.4;
settings.photon_energy_keV = WVL_1A_IN_KEV;
settings.detector_distance_mm = 57.6;
settings.data_file_count = 5;
settings.space_group_number = 45;
settings.sample_name = "lyso1";
REQUIRE_THROWS(LoadDatasetSettings(x, settings));
REQUIRE(x.GetImageNumPerTrigger() == 567);
REQUIRE(x.GetBeamY_pxl() == Approx(324));
REQUIRE(x.GetSpaceGroupNumber() == 0);
}
TEST_CASE("JFJochStateMachine_SetDetectorSettings", "[DiffractionExperiment]") {
Logger logger("JFJochStateMachine_SetDetectorSettings");
JFJochServices services(logger);