Filip Leonarski
07fe4dd3bb
All checks were successful
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 11m23s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 10m32s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 9m15s
Build Packages / Generate python client (push) Successful in 19s
Build Packages / Build documentation (push) Successful in 49s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 9m13s
Build Packages / build:rpm (rocky8) (push) Successful in 9m10s
Build Packages / build:rpm (rocky9) (push) Successful in 9m58s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 8m52s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 8m42s
Build Packages / Unit tests (push) Successful in 1h12m44s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 11m30s
This is an UNSTABLE release. This version significantly rewrites code to predict reflection position and integrate them, especially in case of rotation crystallography. If things go wrong with analysis, it is better to revert to 1.0.0-rc.123. * jfjoch_broker: Improve refection position prediction and Bragg integration code. * jfjoch_broker: Align with XDS way of calculating Lorentz correction and general notation. * jfjoch_writer: Fix saving mosaicity properly in HDF5 file. * jfjoch_viewer: Introduce high-dynamic range mode for images * jfjoch_viewer: Ctrl+mouse wheel has exponential change in foreground (+/-15%) * jfjoch_viewer: Zoom-in numbers have better readability Reviewed-on: #31 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;
|
|
std::optional<GoniometerAxis> axis;
|
|
};
|
|
|
|
class RotationIndexer {
|
|
mutable std::mutex m;
|
|
const DiffractionExperiment& experiment;
|
|
|
|
constexpr static int64_t max_spots = 10000;
|
|
constexpr static int64_t min_images_for_indexing = 10;
|
|
|
|
const bool index_ice_rings;
|
|
bool indexing_tried = false;
|
|
float angle_norm_deg = 1.0f;
|
|
|
|
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);
|
|
std::optional<RotationIndexerResult> ProcessImage(int64_t image, const std::vector<SpotToSave>& spots);
|
|
std::optional<RotationIndexerResult> GetLattice();
|
|
};
|
|
|
|
#endif //JFJOCH_ROTATIONINDEXER_H
|