Files
Jungfraujoch/process/JFJochProcess.h
T
leonarski_f 4697f10555 process: extract reprocessing workflow into shared JFJochProcess library
The full processing workflow no longer lives in the CLIs. New process/JFJochProcess
encapsulates it for jfjoch_process, jfjoch_azint and (later) the viewer:

- ProcessMode {AzimuthalIntegration, FullAnalysis}; ProcessConfig carries run control
  (range, threads, output prefix, spot finding, rotation + scaling options, reference
  data) while the DiffractionExperiment carries all algorithm settings.
- Run() executes setup -> optional two-pass rotation pre-pass -> parallel per-image loop
  (std::thread) -> optional scaling/merging post-pass -> NXmxIntegrated _process.h5 that
  links back to the original images. ProcessResult returns stats + merge text.
- Cancel() / std::atomic<bool> (receiver style), checked between images; the CLIs install
  a SIGINT handler that calls it (fixes the previous Ctrl+C gap), the viewer will use the
  same hook. JFJochProcessObserver streams progress / per-image results for a live GUI.

jfjoch_process.cpp and jfjoch_azint.cpp are now thin: argument parsing + experiment
configuration, then JFJochProcess::Run + stats printing. Behaviour and usage messages
are unchanged.

Adds JFJochProcessTest (azimuthal integration round-trip, no-output run, pre-cancel) over
a small generated dataset.

Verified: tests/jfjoch_test [HDF5] (83 cases / 1854 assertions); jfjoch_azint and
jfjoch_process run end-to-end on lyso_test (azint 20 images; full analysis recovers the
lysozyme cell at 25% indexing).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-21 10:36:18 +02:00

101 lines
3.9 KiB
C++

// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include <atomic>
#include <optional>
#include <string>
#include <vector>
#include "../common/DiffractionExperiment.h"
#include "../common/PixelMask.h"
#include "../common/CrystalLattice.h"
#include "../common/Reflection.h" // MergedReflection
#include "../common/JFJochMessages.h" // DataMessage
#include "../common/JFJochReceiverPlots.h" // MeanProcessingTime
#include "../image_analysis/spot_finding/SpotFindingSettings.h"
class JFJochHDF5Reader;
// Offline reprocessing of a stored Jungfraujoch HDF5 dataset, shared by jfjoch_process,
// jfjoch_azint and (later) the viewer. The full processing workflow lives here, not in the CLIs:
// setup, an optional two-pass rotation-indexing pre-pass, a parallel per-image loop (std::thread),
// an optional scaling/merging post-pass, and the _process.h5 output. The detector geometry and all
// algorithm settings are configured on the DiffractionExperiment by the caller; ProcessConfig only
// carries run control. Cancellable from any thread (e.g. SIGINT or a GUI button) via Cancel().
enum class ProcessMode {
AzimuthalIntegration, // preprocess + azimuthal integration only (jfjoch_azint)
FullAnalysis // spot finding + indexing + refinement + integration (jfjoch_process)
};
struct ProcessConfig {
ProcessMode mode = ProcessMode::FullAnalysis;
int start_image = 0;
int end_image = -1; // -1 => to the end of the dataset
int stride = 1;
int nthreads = 1;
// Output prefix for the _process.h5 (and scaled reflections). Empty => process without writing.
std::string output_prefix;
SpotFindingSettings spot_finding; // FullAnalysis spot finding
// Rotation indexing (FullAnalysis)
bool rotation_indexing = false;
bool two_pass_rotation = true;
bool reuse_rotation_spots = true;
int rotation_indexing_image_count = 30;
std::optional<CrystalLattice> forced_rotation_lattice;
// Scaling / merging (FullAnalysis). reference_data (from a reference MTZ) also drives the
// per-image live scaling path when present.
bool run_scaling = false;
int64_t scaling_iter = 3;
std::vector<MergedReflection> reference_data;
};
struct ProcessResult {
bool cancelled = false;
uint64_t images_processed = 0;
double processing_time_s = 0.0;
double frame_rate_hz = 0.0;
double throughput_MBs = 0.0;
std::optional<float> indexing_rate;
std::optional<UnitCell> consensus_cell;
bool rotation_lattice_found = false;
MeanProcessingTime mean_processing_time{};
std::optional<std::string> written_master_path;
std::string merge_statistics_text; // populated when scaling/merging ran
};
// Callbacks for progress and live results. Methods may be called from worker threads, so an
// implementation must be thread-safe. The default no-ops suit the CLIs.
class JFJochProcessObserver {
public:
virtual ~JFJochProcessObserver() = default;
virtual void OnPhase(const std::string &phase) {}
virtual void OnProgress(uint64_t done, uint64_t total) {}
virtual void OnImageProcessed(const DataMessage &msg) {}
};
class JFJochProcess {
JFJochHDF5Reader &reader_;
DiffractionExperiment experiment_;
PixelMask pixel_mask_;
ProcessConfig config_;
std::atomic<bool> cancelled_{false};
public:
JFJochProcess(JFJochHDF5Reader &reader, DiffractionExperiment experiment,
PixelMask pixel_mask, ProcessConfig config);
// Runs the configured workflow to completion or until Cancel(). Throws on setup failure.
ProcessResult Run(JFJochProcessObserver *observer = nullptr);
// Request cancellation; safe to call from any thread (the worker loop checks between images).
void Cancel() { cancelled_ = true; }
bool IsCancelled() const { return cancelled_; }
};