jfjoch_test: Fix XtalOptimizer test
Build Packages / Build documentation (push) Successful in 1m42s
Build Packages / XDS test (durin plugin) (pull_request) Successful in 9m38s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 8m43s
Build Packages / Generate python client (pull_request) Successful in 35s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 10m35s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m44s
Build Packages / build:rpm (ubuntu2404) (pull_request) Successful in 12m13s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 14m21s
Build Packages / XDS test (neggia plugin) (push) Successful in 9m15s
Build Packages / build:rpm (rocky9) (pull_request) Successful in 14m28s
Build Packages / build:rpm (rocky8_sls9) (pull_request) Successful in 7m59s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 16m48s
Build Packages / XDS test (durin plugin) (push) Successful in 9m48s
Build Packages / Create release (pull_request) Has been skipped
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 17m58s
Build Packages / DIALS test (push) Successful in 14m28s
Build Packages / Build documentation (pull_request) Successful in 53s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 17m54s
Build Packages / build:rpm (rocky8_nocuda) (pull_request) Successful in 11m36s
Build Packages / build:rpm (ubuntu2204) (pull_request) Successful in 13m33s
Build Packages / build:rpm (rocky8) (push) Successful in 18m20s
Build Packages / XDS test (JFJoch plugin) (pull_request) Successful in 8m45s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 18m43s
Build Packages / build:rpm (ubuntu2204_nocuda) (pull_request) Successful in 10m54s
Build Packages / XDS test (neggia plugin) (pull_request) Successful in 7m38s
Build Packages / build:rpm (rocky9) (push) Successful in 19m10s
Build Packages / build:rpm (rocky9_nocuda) (pull_request) Successful in 13m5s
Build Packages / DIALS test (pull_request) Successful in 15m4s
Build Packages / Generate python client (push) Successful in 1m34s
Build Packages / build:rpm (ubuntu2404_nocuda) (pull_request) Successful in 8m8s
Build Packages / Unit tests (push) Successful in 1h8m55s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m14s
Build Packages / build:rpm (rocky9_sls9) (pull_request) Successful in 11m35s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky8) (pull_request) Successful in 9m47s
Build Packages / Unit tests (pull_request) Successful in 58m35s

This commit is contained in:
2026-04-25 15:13:22 +02:00
parent e7fcaaa03f
commit d21b03a29c
+12 -11
View File
@@ -31,7 +31,7 @@ TEST_CASE("XtalOptimizer") {
spots.push_back(SpotToSave{refl.predicted_x, refl.predicted_y});
}
XtalOptimizerData xtal_opt;
XtalOptimizerData xtal_opt{};
xtal_opt.latt = CrystalLattice(40.2,39.4,80.2, 90,91, 89);
xtal_opt.geom.BeamX_pxl(1010).BeamY_pxl(995).DetectorDistance_mm(200)
.PoniRot1_rad(0.01).PoniRot2_rad(0.02);
@@ -84,7 +84,7 @@ TEST_CASE("XtalOptimizer_NoBeamCenter") {
spots.push_back(SpotToSave{refl.predicted_x, refl.predicted_y});
}
XtalOptimizerData xtal_opt;
XtalOptimizerData xtal_opt{};
xtal_opt.latt = CrystalLattice(40.2,49.4,80.2, 90,94, 89);
xtal_opt.geom.BeamX_pxl(999.8).BeamY_pxl(1000.2).DetectorDistance_mm(200)
.PoniRot1_rad(0.01).PoniRot2_rad(0.02);
@@ -136,7 +136,7 @@ TEST_CASE("XtalOptimizer_orthorombic") {
auto refl = prediction.GetReflections().at(i);
spots.push_back(SpotToSave{refl.predicted_x, refl.predicted_y});
}
XtalOptimizerData xtal_opt;
XtalOptimizerData xtal_opt{};
xtal_opt.latt = CrystalLattice(40.2,49.6,80.3, 90,91, 89);
xtal_opt.geom.BeamX_pxl(1005).BeamY_pxl(997).DetectorDistance_mm(200)
.PoniRot1_rad(0.01).PoniRot2_rad(0.02);
@@ -187,11 +187,12 @@ TEST_CASE("XtalOptimizer_triclinic") {
auto refl = prediction.GetReflections().at(i);
spots.push_back(SpotToSave{refl.predicted_x, refl.predicted_y});
}
XtalOptimizerData xtal_opt;
XtalOptimizerData xtal_opt{};
xtal_opt.latt = CrystalLattice(40.1,54.9,121, 95,97, 99.5);
xtal_opt.geom.BeamX_pxl(997).BeamY_pxl(1005).DetectorDistance_mm(200)
.PoniRot1_rad(0.01).PoniRot2_rad(0.02);
xtal_opt.crystal_system = gemmi::CrystalSystem::Triclinic;
xtal_opt.max_time = 1.0;
auto start = std::chrono::high_resolution_clock::now();
REQUIRE(XtalOptimizer(xtal_opt, spots));
auto end = std::chrono::high_resolution_clock::now();
@@ -239,7 +240,7 @@ TEST_CASE("XtalOptimizer_tetragonal") {
spots.push_back(SpotToSave{refl.predicted_x, refl.predicted_y});
}
XtalOptimizerData xtal_opt;
XtalOptimizerData xtal_opt{};
xtal_opt.latt = CrystalLattice(40.6,39.3,80.5, 90,91, 89);
xtal_opt.geom.BeamX_pxl(1010).BeamY_pxl(995).DetectorDistance_mm(200)
.PoniRot1_rad(0.01).PoniRot2_rad(0.02);
@@ -290,7 +291,7 @@ TEST_CASE("XtalOptimizer_hexagonal") {
spots.push_back(SpotToSave{refl.predicted_x, refl.predicted_y});
}
XtalOptimizerData xtal_opt;
XtalOptimizerData xtal_opt{};
xtal_opt.latt = CrystalLattice(39.5,39.8,70.1, 90,90, 119.5);
xtal_opt.geom.BeamX_pxl(1007).BeamY_pxl(990).DetectorDistance_mm(200)
.PoniRot1_rad(0.01).PoniRot2_rad(0.02);
@@ -343,7 +344,7 @@ TEST_CASE("XtalOptimizer_hexagonal_unconstrained") {
spots.push_back(SpotToSave{refl.predicted_x, refl.predicted_y});
}
XtalOptimizerData xtal_opt;
XtalOptimizerData xtal_opt{};
xtal_opt.latt = CrystalLattice(39.9,39.8,70.1, 90,90, 120);
xtal_opt.geom.BeamX_pxl(1002).BeamY_pxl(998).DetectorDistance_mm(200)
.PoniRot1_rad(0.01).PoniRot2_rad(0.02);
@@ -399,7 +400,7 @@ TEST_CASE("XtalOptimizer_cubic") {
spots.push_back(SpotToSave{refl.predicted_x, refl.predicted_y});
}
XtalOptimizerData xtal_opt;
XtalOptimizerData xtal_opt{};
xtal_opt.latt = CrystalLattice(Coord(39,0,0),
Coord(0, 39.5 / sqrt(2), -40.5 / sqrt(2)),
Coord(0, 39.2 / sqrt(2), 39.7 / sqrt(2)));
@@ -454,7 +455,7 @@ TEST_CASE("XtalOptimizer_monoclinic") {
spots.push_back(SpotToSave{refl.predicted_x, refl.predicted_y});
}
XtalOptimizerData xtal_opt;
XtalOptimizerData xtal_opt{};
xtal_opt.latt = CrystalLattice(49.5, 60.5, 69.8, 90, 113.5, 90);
xtal_opt.geom.BeamX_pxl(1007).BeamY_pxl(990).DetectorDistance_mm(200)
.PoniRot1_rad(0.01).PoniRot2_rad(0.02);
@@ -595,7 +596,7 @@ TEST_CASE("XtalOptimizer_rotation") {
}
// Seed slightly perturbed geometry and lattice; provide rotation axis for refinement
XtalOptimizerData xtal_opt;
XtalOptimizerData xtal_opt{};
xtal_opt.latt = CrystalLattice(39.7f, 50.6f, 79.6f, 90.0f, 94.5f, 90.5f);
xtal_opt.geom.BeamX_pxl(1003).BeamY_pxl(997).DetectorDistance_mm(203.0)
.PoniRot1_rad(0.01).PoniRot2_rad(0.02);
@@ -679,7 +680,7 @@ TEST_CASE("XtalOptimizer_refine_rotation_axis") {
}
// Seed slightly perturbed geometry and lattice; provide rotation axis for refinement
XtalOptimizerData xtal_opt;
XtalOptimizerData xtal_opt{};
xtal_opt.latt = CrystalLattice(39.7f, 50.6f, 79.6f, 90.0f, 94.5f, 90.5f);
xtal_opt.geom.BeamX_pxl(1003).BeamY_pxl(997).DetectorDistance_mm(200.0)
.PoniRot1_rad(0.01).PoniRot2_rad(0.02);