Filip Leonarski
31a357fa57
All checks were successful
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 11m0s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 11m2s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 11m54s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 8m20s
Build Packages / Generate python client (push) Successful in 24s
Build Packages / Build documentation (push) Successful in 56s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky8) (push) Successful in 8m51s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 9m9s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 8m53s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 8m21s
Build Packages / build:rpm (rocky9) (push) Successful in 9m47s
Build Packages / Unit tests (push) Successful in 1h13m38s
This is an UNSTABLE release and not recommended for production use (please use rc.111 instead). * jfjoch_broker: Improve handling of rotation indexing * jfjoch_broker: More information saved in CBOR end message (WIP) * jfjoch_writer: Save rotation indexing lattice parameters and Niggli class * jfjoch_viewer: Remove (for now) primitive cell information Reviewed-on: #19 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch> Co-committed-by: Filip Leonarski <filip.leonarski@psi.ch>
62 lines
2.0 KiB
C++
62 lines
2.0 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#ifndef JFJOCH_ROTATIONINDEXER_H
|
|
#define JFJOCH_ROTATIONINDEXER_H
|
|
|
|
#include <vector>
|
|
#include <mutex>
|
|
|
|
#include "../common/DiffractionSpot.h"
|
|
#include "../common/DiffractionExperiment.h"
|
|
#include "indexing/IndexerThreadPool.h"
|
|
#include "lattice_search/LatticeSearch.h"
|
|
|
|
// RotationIndexer works as following:
|
|
// 1. First accumulates spot results from rotation images (only images within a certain stride are included)
|
|
// 2. When a minimum number of images is reached (at least 10 images AND at least 10 deg), indexing is attempted
|
|
// 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 RotationIndexerResult {
|
|
CrystalLattice lattice;
|
|
LatticeSearchResult search_result;
|
|
DiffractionGeometry geom;
|
|
};
|
|
|
|
class RotationIndexer {
|
|
mutable std::mutex m;
|
|
const DiffractionExperiment& experiment;
|
|
|
|
constexpr static int64_t max_spots = 60000;
|
|
constexpr static int64_t min_images_for_indexing = 10;
|
|
|
|
const bool index_ice_rings;
|
|
|
|
std::vector<SpotToSave> v_;
|
|
std::vector<Coord> coords_;
|
|
std::optional<GoniometerAxis> axis_;
|
|
const DiffractionGeometry geom_;
|
|
DiffractionGeometry updated_geom_;
|
|
LatticeSearchResult search_result_;
|
|
|
|
IndexerThreadPool &indexer_;
|
|
|
|
int64_t last_accumulated_image = -1;
|
|
int64_t accumulated_images = 0;
|
|
|
|
int64_t image_stride;
|
|
int64_t first_image_to_try_indexing;
|
|
|
|
std::optional<CrystalLattice> indexed_lattice;
|
|
|
|
|
|
void TryIndex();
|
|
public:
|
|
RotationIndexer(const DiffractionExperiment& x, IndexerThreadPool& indexer);
|
|
void SetLattice(const CrystalLattice &lattice);
|
|
std::optional<RotationIndexerResult> ProcessImage(int64_t image, const std::vector<SpotToSave>& spots);
|
|
std::optional<RotationIndexerResult> Finalize();
|
|
};
|
|
|
|
#endif //JFJOCH_ROTATIONINDEXER_H
|