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

Revert "jfjoch_indexing_test: Bring back old, working code, to further modify"

Browse Source 
This reverts commit 756115606c.
This commit is contained in:
leonarski_f
2025-11-30 13:32:13 +01:00
parent 756115606c
commit 8326e4a59f
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tools/jfjoch_indexing_test.cpp
View File

@@ -4,7 +4,8 @@
#include "../reader/JFJochHDF5Reader.h"
#include "../image_analysis/indexing/IndexerFactory.h"
#include "../common/Logger.h"
#include "../image_analysis/RotationIndexer.h"
#include "../image_analysis/IndexAndRefine.h"
#include "../image_analysis/bragg_integration/BraggPredictionFactory.h"
#include "../writer/FileWriter.h"
#include "../image_analysis/indexing/AnalyzeIndexing.h"
@@ -24,8 +25,8 @@ int main(int argc, char** argv) {
indexing_settings.Algorithm(IndexingAlgorithmEnum::FFT);
indexing_settings.RotationIndexing(true);
indexing_settings.GeomRefinementAlgorithm(GeomRefinementAlgorithmEnum::BeamCenter);
DiffractionExperiment experiment(reader.GetDataset()->experiment);
experiment.ImportIndexingSettings(indexing_settings);
experiment.SetUnitCell({});
experiment.FilePrefix("output");
@@ -34,12 +35,16 @@ int main(int argc, char** argv) {
// FileWriter fw(msg);
IndexerThreadPool indexer(experiment.GetIndexingSettings());
SpotFindingSettings settings{};
settings.quick_integration = false;
settings.indexing = true;
auto geom = experiment.GetDiffractionGeometry();
RotationIndexer rot_index(experiment, indexer);
int cnt = 0;
int cnt_2 = 0;
IndexAndRefine rot_index(experiment, &indexer);
auto prediction = CreateBraggPrediction();
int cnt = 0;
for (int i = 0; i < reader.GetNumberOfImages(); i++) {
auto img = reader.LoadImage(i);
@@ -48,19 +53,13 @@ int main(int argc, char** argv) {
DataMessage msg = img->ImageData();
auto img_res = rot_index.ProcessImage(i, msg.spots);
if (img_res ) {
auto img_latt = img_res->lattice;
DiffractionExperiment x(experiment);
x.DetectorDistance_mm(img_res->geom.GetDetectorDistance_mm())
.BeamX_pxl(img_res->geom.GetBeamX_pxl())
.BeamY_pxl(img_res->geom.GetBeamY_pxl());
rot_index.ProcessImage(msg, settings, msg.image, *prediction);
if (msg.indexing_result && msg.indexing_result.value())
cnt++;
if (AnalyzeIndexing(msg, x, img_latt))
cnt_2++;
}
if (i % 200 == 0)
logger.Info("Image {} {} {}", i, cnt, cnt_2);
logger.Info("Image {} {}", i, cnt);
}
auto latt_1 = rot_index.Finalize(false);