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

v1.0.0-rc.70

Browse Source
This commit is contained in:
leonarski_f
2025-08-27 06:21:10 +02:00
parent 06978efe6b
commit bb32f27635
229 changed files with 2446 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
image_analysis/ImageAnalysisCPU.cpp
View File

@@ -3,9 +3,10 @@
#include "ImageAnalysisCPU.h"
#include "StrongPixelSet.h"
#include "spot_finding/StrongPixelSet.h"
#include "../compression/JFJochDecompress.h"
#include "SpotAnalysis.h"
#include "spot_finding/SpotAnalysis.h"
#include "geom_refinement/XtalOptimizer.h"
ImageAnalysisCPU::ImageAnalysisCPU(const DiffractionExperiment &in_experiment,
const AzimuthalIntegration &in_integration,
@@ -163,13 +164,41 @@ void ImageAnalysisCPU::Analyze(DataMessage &output,
if ((indexer != nullptr) && spot_finding_settings.indexing) {
auto latt_f = indexer->Run(experiment, output);
auto latt = latt_f.get();
if (latt && spot_finding_settings.quick_integration) {
auto img = CompressedImage(updated_image, experiment.GetXPixelsNum(),
experiment.GetYPixelsNum());
auto res = BraggIntegrate2D(experiment, img, latt.value());
output.reflections = res.reflections;
output.b_factor = res.b_factor;
if (latt) {
DiffractionExperiment experiment_copy(experiment);
XtalOptimizerData data{
.geom = experiment_copy.GetDiffractionGeometry(),
.latt = latt.value()
};
switch (experiment.GetIndexingSettings().GetGeomRefinementAlgorithm()) {
case GeomRefinementAlgorithmEnum::None:
break;
case GeomRefinementAlgorithmEnum::BeamCenter:
XtalOptimizer(data, output.spots, false);
experiment_copy.BeamX_pxl(data.geom.GetBeamX_pxl()).BeamY_pxl(data.geom.GetBeamY_pxl());
output.beam_center_x = data.geom.GetBeamX_pxl();
output.beam_center_y = data.geom.GetBeamY_pxl();
latt = data.latt;
output.indexing_lattice = data.latt;
break;
case GeomRefinementAlgorithmEnum::BeamCenterTetragonal:
XtalOptimizer(data, output.spots, true);
experiment_copy.BeamX_pxl(data.geom.GetBeamX_pxl()).BeamY_pxl(data.geom.GetBeamY_pxl());
output.beam_center_x = data.geom.GetBeamX_pxl();
output.beam_center_y = data.geom.GetBeamY_pxl();
latt = data.latt;
output.indexing_lattice = data.latt;
break;
}
if (spot_finding_settings.quick_integration) {
auto img = CompressedImage(updated_image, experiment.GetXPixelsNum(), experiment.GetYPixelsNum());
auto res = BraggIntegrate2D(experiment_copy, img, latt.value());
output.reflections = res.reflections;
output.b_factor = res.b_factor;
}
}
}