IndexAndRefine: Fix using lattice at zero deg for refinement
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 12m3s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m58s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 13m21s
Build Packages / Generate python client (push) Successful in 29s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m33s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky8) (push) Successful in 13m53s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 14m0s
Build Packages / Build documentation (push) Successful in 43s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 14m10s
Build Packages / build:rpm (rocky9) (push) Successful in 15m7s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 7m23s
Build Packages / Unit tests (push) Successful in 53m10s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 12m3s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m58s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 13m21s
Build Packages / Generate python client (push) Successful in 29s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m33s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky8) (push) Successful in 13m53s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 14m0s
Build Packages / Build documentation (push) Successful in 43s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 14m10s
Build Packages / build:rpm (rocky9) (push) Successful in 15m7s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 7m23s
Build Packages / Unit tests (push) Successful in 53m10s
This commit is contained in:
@@ -26,7 +26,11 @@ IndexAndRefine::IndexingOutcome IndexAndRefine::DetermineLatticeAndSymmetry(Data
|
||||
if (rotation_indexer) {
|
||||
auto result = rotation_indexer->ProcessImage(msg.number, msg.spots);
|
||||
if (result) {
|
||||
outcome.lattice_candidate = result->lattice;
|
||||
|
||||
// get rotated lattice
|
||||
auto gon = experiment.GetGoniometer();
|
||||
if (gon)
|
||||
outcome.lattice_candidate = result->lattice.Multiply(gon->GetTransformation(-msg.number));
|
||||
|
||||
outcome.experiment.BeamX_pxl(result->geom.GetBeamX_pxl())
|
||||
.BeamY_pxl(result->geom.GetBeamY_pxl())
|
||||
@@ -132,10 +136,6 @@ void IndexAndRefine::QuickPredictAndIntegrate(DataMessage &msg,
|
||||
CrystalLattice latt = outcome.lattice_candidate.value();
|
||||
|
||||
if (rotation_indexer) {
|
||||
// Rotate lattice_candidate to the current image angle
|
||||
auto gon = experiment.GetGoniometer();
|
||||
if (gon)
|
||||
latt = outcome.lattice_candidate->Multiply(gon->GetTransformation(-msg.number));
|
||||
// Use moving average for mosaicity and profile_radius (also add beam center later)
|
||||
if (msg.mosaicity_deg)
|
||||
msg.mosaicity_deg = rotation_parameters.Mosaicity(msg.mosaicity_deg.value());
|
||||
@@ -201,8 +201,7 @@ void IndexAndRefine::ProcessImage(DataMessage &msg,
|
||||
if (!outcome.lattice_candidate)
|
||||
return;
|
||||
|
||||
if (!AnalyzeIndexing(msg, outcome.experiment, *outcome.lattice_candidate,
|
||||
outcome.experiment.GetGoniometer(), rotation_indexer.get() != nullptr))
|
||||
if (!AnalyzeIndexing(msg, outcome.experiment, *outcome.lattice_candidate))
|
||||
return;
|
||||
|
||||
msg.lattice_type = outcome.symmetry;
|
||||
|
||||
Reference in New Issue
Block a user