Release 1.0.0_rc.9

This commit is contained in:
2024-06-20 11:26:40 +02:00
parent 8809b8d0d5
commit a32c7274a6
44 changed files with 1524 additions and 1188 deletions
+56 -24
View File
@@ -472,6 +472,18 @@ TEST_CASE("DiffractionExperiment_SaveCalibration", "[DiffractionExperiment]") {
REQUIRE(!x.GetSaveCalibration());
}
TEST_CASE("DiffractionExperiment_FrameCountTime","[DiffractionExperiment]") {
DiffractionExperiment x;
REQUIRE_NOTHROW(x.FrameTime(1000us, 3us));
REQUIRE_NOTHROW(x.FrameTime(1000us));
REQUIRE(x.GetFrameCountTime() == 1000us - std::chrono::microseconds(READOUT_TIME_IN_US));
REQUIRE_NOTHROW(x.FrameTime(2000us));
REQUIRE_THROWS(x.FrameTime(2500us));
REQUIRE_THROWS(x.FrameTime(10000us, 2100us));
REQUIRE_NOTHROW(x.FrameTime(10000us, 10us));
}
//TODO: Update
/*
TEST_CASE("DiffractionExperiment_FrameCountTime","[DiffractionExperiment]") {
@@ -774,40 +786,44 @@ TEST_CASE("DiffractionExperiment_Appendix","") {
TEST_CASE("DiffractionExperiment_OmegaRotationAxis","[DiffractionExperiment]") {
DiffractionExperiment x;
x.DefaultOmegaAxis({0,-1,0});
REQUIRE(x.GetDefaultOmegaAxis().x == 0);
REQUIRE(x.GetDefaultOmegaAxis().y == -1);
x.DefaultRotationAxis({0, -1, 0});
REQUIRE(x.GetDefaultRotationAxis().x == 0);
REQUIRE(x.GetDefaultRotationAxis().y == -1);
x.OmegaAxis();
REQUIRE(x.GetOmegaAxis().x == 0);
REQUIRE(x.GetOmegaAxis().y == -1);
x.RotationAxis({});
REQUIRE(x.GetRotationAxis().x == 0);
REQUIRE(x.GetRotationAxis().y == -1);
x.OmegaAxis({-1, 0, 0});
REQUIRE(x.GetOmegaAxis().x == -1);
REQUIRE(x.GetOmegaAxis().y == 0);
x.RotationAxis(Coord{-1, 0, 0});
REQUIRE(x.GetRotationAxis().x == -1);
REQUIRE(x.GetRotationAxis().y == 0);
REQUIRE_THROWS(x.DefaultOmegaAxis({0,0,0}));
REQUIRE_THROWS(x.OmegaAxis({0,0,0}));
REQUIRE_THROWS(x.DefaultRotationAxis({0, 0, 0}));
REQUIRE_THROWS(x.RotationAxis(Coord{0,0,0}));
}
TEST_CASE("DiffractionExperiment_OmegaStep","[DiffractionExperiment]") {
DiffractionExperiment x;
StartMessage msg;
x.OmegaStep(std::optional<float>());
x.FillMessage(msg);
REQUIRE(!x.GetOmegaStep());
REQUIRE(msg.omega.increment == 0.0f);
REQUIRE(!x.GetGoniometer());
REQUIRE(!msg.goniometer);
x.OmegaStep(0.0);
REQUIRE(!x.GetOmegaStep());
x.FillMessage(msg);
REQUIRE(msg.omega.increment == 0.0f);
DatasetSettings d;
d.Goniometer(GoniometerAxis{
.name = "omega",
.increment = 75.0f,
.start = 20.0f
});
x.ImportDatasetSettings(d);
x.OmegaStep(1.0);
x.FillMessage(msg);
REQUIRE(x.GetOmegaStep());
REQUIRE(msg.omega.increment == 1.0f);
REQUIRE(x.GetGoniometer().has_value());
REQUIRE(msg.goniometer);
REQUIRE(msg.goniometer->name == "omega");
REQUIRE(msg.goniometer->increment == 75.0f);
REQUIRE(msg.goniometer->start == 20.0f);
}
TEST_CASE("DiffractionExperiment_ConversionOnFPGA","[DiffractionExperiment]") {
@@ -862,7 +878,23 @@ TEST_CASE("DiffractionExperiment_PhotonEnergyMultiplayer","[DiffractionExperimen
REQUIRE(x.GetPhotonEnergyForConversion_keV() == 16.0f);
}
TEST_CASE("DiffractioExperiment_GetDefaultPlotBinning", "[DiffractionExperiment]") {
TEST_CASE("DiffractionExperiment_SeriesID","[DiffractionExperiment]") {
DiffractionExperiment x;
REQUIRE(x.GetRunNumber() == 0);
x.IncrementRunNumber();
REQUIRE(x.GetRunNumber() == 1);
DatasetSettings d;
d.RunNumber(25);
x.ImportDatasetSettings(d);
REQUIRE(x.GetRunNumber() == 25);
d.RunNumber({});
x.ImportDatasetSettings(d);
REQUIRE(x.GetRunNumber() == 1);
}
TEST_CASE("DiffractionExperiment_GetDefaultPlotBinning", "[DiffractionExperiment]") {
DiffractionExperiment x;
x.FrameTime(std::chrono::milliseconds(1));
@@ -879,7 +911,7 @@ TEST_CASE("DiffractioExperiment_GetDefaultPlotBinning", "[DiffractionExperiment]
CHECK(x.GetDefaultPlotBinning() == 1);
}
TEST_CASE("DiffractioExperiment_ImportDataset_TooManyFrames", "[DiffractionExperiment]") {
TEST_CASE("DiffractionExperiment_ImportDataset_TooManyFrames", "[DiffractionExperiment]") {
DiffractionExperiment x(DetectorGeometry(8, 2, 8, 36, true));
x.ImagesPerTrigger(345).NumTriggers(17);
DatasetSettings dataset;
@@ -888,7 +920,7 @@ TEST_CASE("DiffractioExperiment_ImportDataset_TooManyFrames", "[DiffractionExper
REQUIRE(x.GetImageNum() == 345 * 17);
}
TEST_CASE("DiffractioExperiment_ExportROIMask", "[DiffractionExperiment]") {
TEST_CASE("DiffractionExperiment_ExportROIMask", "[DiffractionExperiment]") {
DiffractionExperiment x(DetectorGeometry(8, 2, 8, 36, true));
x.Mode(DetectorMode::Conversion);