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

v1.0.0-rc.112 #18

Merged
leonarski_f merged 37 commits from 2511-1.0.0-rc.112 into main 2025-11-30 17:39:23 +01:00
Conversation 0 Commits 37 Files Changed 186 +20 -16
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c8d28a8921 - Show all commits

12
image_analysis/RotationIndexer.cpp
View File

@@ -102,7 +102,7 @@ void RotationIndexer::TryIndex() {
}
}
std::optional<RotatinIndexerImageResult> RotationIndexer::ProcessImage(int64_t image, const std::vector<SpotToSave> &spots) {
std::optional<RotationIndexerResult> RotationIndexer::ProcessImage(int64_t image, const std::vector<SpotToSave> &spots) {
std::unique_lock ul(m);
// For non-rotation just ignore the whole procedure
@@ -142,7 +142,7 @@ std::optional<RotatinIndexerImageResult> RotationIndexer::ProcessImage(int64_t i
};
if (XtalOptimizer(data, spots))
return RotatinIndexerImageResult{
return RotationIndexerResult{
.lattice = data.latt,
.search_result = search_result_,
.geom = data.geom
@@ -152,8 +152,12 @@ std::optional<RotatinIndexerImageResult> RotationIndexer::ProcessImage(int64_t i
}
std::optional<CrystalLattice> RotationIndexer::Finalize(bool retry) {
std::optional<RotationIndexerResult> RotationIndexer::Finalize(bool retry) {
if (!indexed_lattice || retry)
TryIndex();
return indexed_lattice;
return RotationIndexerResult{
.lattice = indexed_lattice.value(),
.search_result = search_result_,
.geom = geom_
};
}

8
image_analysis/RotationIndexer.h
View File

@@ -18,7 +18,7 @@
// 3. If indexing is successful - lattice is provided that is used by subsequent images
// 4. If indexing is not-successful - accumulation procedure is continued
struct RotatinIndexerImageResult {
struct RotationIndexerResult {
CrystalLattice lattice;
LatticeSearchResult search_result;
DiffractionGeometry geom;
@@ -28,7 +28,7 @@ class RotationIndexer {
mutable std::mutex m;
const DiffractionExperiment& experiment;
constexpr static int64_t max_spots = 32768;
constexpr static int64_t max_spots = 60000;
constexpr static float min_accum_angle_deg = 20.0;
constexpr static float stride_angle_deg = 0.5;
constexpr static int64_t min_images_for_indexing = 10;
@@ -57,8 +57,8 @@ class RotationIndexer {
public:
RotationIndexer(const DiffractionExperiment& x, IndexerThreadPool& indexer);
void SetLattice(const CrystalLattice &lattice);
std::optional<RotatinIndexerImageResult> ProcessImage(int64_t image, const std::vector<SpotToSave>& spots);
std::optional<CrystalLattice> Finalize(bool retry);
std::optional<RotationIndexerResult> ProcessImage(int64_t image, const std::vector<SpotToSave>& spots);
std::optional<RotationIndexerResult> Finalize(bool retry);
};

16
tools/jfjoch_indexing_test.cpp
View File

@@ -61,19 +61,19 @@ int main(int argc, char** argv) {
}
auto latt_1 = rot_index.Finalize(false);
if (latt_1) {
auto uc = latt_1->GetUnitCell();
auto uc = latt_1->lattice.GetUnitCell();
logger.Info("Unit cell {} {} {} {} {} {}", uc.a, uc.b, uc.c, uc.alpha, uc.beta, uc.gamma);
logger.Info("Latt1 {} {} {}", latt_1->Vec0().x, latt_1->Vec0().y, latt_1->Vec0().z);
logger.Info("Latt1 {} {} {}", latt_1->Vec1().x, latt_1->Vec1().y, latt_1->Vec1().z);
logger.Info("Latt1 {} {} {}", latt_1->Vec2().x, latt_1->Vec2().y, latt_1->Vec2().z);
logger.Info("Latt1 {} {} {}", latt_1->lattice.Vec0().x, latt_1->lattice.Vec0().y, latt_1->lattice.Vec0().z);
logger.Info("Latt1 {} {} {}", latt_1->lattice.Vec1().x, latt_1->lattice.Vec1().y, latt_1->lattice.Vec1().z);
logger.Info("Latt1 {} {} {}", latt_1->lattice.Vec2().x, latt_1->lattice.Vec2().y, latt_1->lattice.Vec2().z);
}
auto latt_2 = rot_index.Finalize(true);
if (latt_2) {
auto uc = latt_2->GetUnitCell();
auto uc = latt_2->lattice.GetUnitCell();
logger.Info("Unit cell {} {} {} {} {} {}", uc.a, uc.b, uc.c, uc.alpha, uc.beta, uc.gamma);
logger.Info("Latt1 {} {} {}", latt_2->Vec0().x, latt_2->Vec0().y, latt_2->Vec0().z);
logger.Info("Latt1 {} {} {}", latt_2->Vec1().x, latt_2->Vec1().y, latt_2->Vec1().z);
logger.Info("Latt1 {} {} {}", latt_2->Vec2().x, latt_2->Vec2().y, latt_2->Vec2().z);
logger.Info("Latt1 {} {} {}", latt_2->lattice.Vec0().x, latt_2->lattice.Vec0().y, latt_2->lattice.Vec0().z);
logger.Info("Latt1 {} {} {}", latt_2->lattice.Vec1().x, latt_2->lattice.Vec1().y, latt_2->lattice.Vec1().z);
logger.Info("Latt1 {} {} {}", latt_2->lattice.Vec2().x, latt_2->lattice.Vec2().y, latt_2->lattice.Vec2().z);
}
}