Build Packages / build:windows:nocuda (pull_request) Successful in 14m25s
Build Packages / build:windows:cuda (pull_request) Successful in 16m48s
Build Packages / build:rpm (rocky8_nocuda) (pull_request) Successful in 12m0s
Build Packages / build:rpm (ubuntu2204_nocuda) (pull_request) Successful in 11m27s
Build Packages / build:rpm (rocky9_nocuda) (pull_request) Successful in 12m24s
Build Packages / build:rpm (ubuntu2404_nocuda) (pull_request) Successful in 11m13s
Build Packages / build:rpm (rocky8_sls9) (pull_request) Successful in 12m9s
Build Packages / build:rpm (rocky9_sls9) (pull_request) Successful in 12m25s
Build Packages / build:rpm (rocky8) (pull_request) Successful in 11m8s
Build Packages / build:rpm (ubuntu2204) (pull_request) Successful in 10m48s
Build Packages / XDS test (durin plugin) (pull_request) Successful in 8m44s
Build Packages / Generate python client (pull_request) Successful in 13s
Build Packages / build:rpm (rocky9) (pull_request) Successful in 11m57s
Build Packages / Create release (pull_request) Skipped
Build Packages / Build documentation (pull_request) Successful in 43s
Build Packages / build:rpm (ubuntu2404) (pull_request) Successful in 11m54s
Build Packages / DIALS test (pull_request) Successful in 13m47s
Build Packages / XDS test (neggia plugin) (pull_request) Successful in 6m15s
Build Packages / XDS test (JFJoch plugin) (pull_request) Successful in 6m51s
Build Packages / Unit tests (pull_request) Successful in 59m10s
Build Packages / Unit tests (push) Successful in 1h13m8s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 14m54s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 15m34s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 15m28s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 14m20s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 15m11s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 16m0s
Build Packages / build:rpm (rocky8) (push) Successful in 15m14s
Build Packages / build:rpm (rocky9) (push) Successful in 13m20s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m37s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m1s
Build Packages / DIALS test (push) Successful in 12m23s
Build Packages / XDS test (durin plugin) (push) Successful in 8m1s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 8m16s
Build Packages / XDS test (neggia plugin) (push) Successful in 8m57s
Build Packages / Generate python client (push) Successful in 27s
Build Packages / Build documentation (push) Successful in 1m36s
Build Packages / Create release (push) Skipped
Build Packages / build:windows:nocuda (push) Successful in 15m25s
Build Packages / build:windows:cuda (push) Successful in 17m38s
Add -q/--azim-q-spacing, --azim-min-q, --azim-max-q, --azim-phi-bins (mirroring jfjoch_azint) so offline processing can set the radial binning, applied before the azint mapping is built. Set the AzimuthalIntegrationSettings default spacing to 0.01 1/A (was 0.05): the coarse default barely resolved the narrow ice rings, diluting the ice-ring score. Finer binning sharpens it a lot with no effect on processing - EP_cs_01-17 ice score 4.6->7.3 (max 11->23), clean cytC stays ~1.0, and space group / cell / ISa / completeness are unchanged (cytC, InsI3, MyoB, pding4_001 verified full-image). Documented in JFJOCH_PROCESS.md. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
57 lines
2.2 KiB
C++
57 lines
2.2 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include "JFJochMath.h"
|
|
#include <optional>
|
|
#include <cstdint>
|
|
|
|
class AzimuthalIntegrationSettings {
|
|
constexpr static float minQ_recipA = 1e-5;
|
|
constexpr static float maxQ_recipA = 10.0;
|
|
|
|
bool solid_angle_correction = true;
|
|
bool polarization_correction = true;
|
|
float high_q_recipA = 5.0;
|
|
float low_q_recipA = 0.1;
|
|
float bkg_estimate_high_q_recipA = 2.0f * PI / 3.0;
|
|
float bkg_estimate_low_q_recipA = 2.0f * PI / 5.0;
|
|
float q_spacing = 0.01;
|
|
int32_t azim_bins = 1;
|
|
// Compute azimuthal integration on the CPU instead of the FPGA during the FPGA
|
|
// acquisition workflow. Lifts the FPGA bin-count limit and adds standard-deviation output.
|
|
bool force_cpu_in_fpga_workflow = false;
|
|
|
|
int32_t q_bins= 0;
|
|
int32_t total_bins = 0;
|
|
|
|
void UpdateBinCount();
|
|
public:
|
|
AzimuthalIntegrationSettings();
|
|
AzimuthalIntegrationSettings& SolidAngleCorrection(bool input);
|
|
AzimuthalIntegrationSettings& PolarizationCorrection(bool input);
|
|
AzimuthalIntegrationSettings& QRange_recipA(float low, float high);
|
|
AzimuthalIntegrationSettings& QSpacing_recipA(float input);
|
|
AzimuthalIntegrationSettings& BkgEstimateQRange_recipA(float low, float high);
|
|
AzimuthalIntegrationSettings& AzimuthalBinCount(int32_t input);
|
|
AzimuthalIntegrationSettings& ForceCPUinFPGAWorkflow(bool input);
|
|
|
|
[[nodiscard]] bool IsSolidAngleCorrection() const;
|
|
[[nodiscard]] bool IsPolarizationCorrection() const;
|
|
[[nodiscard]] float GetHighQ_recipA() const;
|
|
[[nodiscard]] float GetLowQ_recipA() const;
|
|
[[nodiscard]] float GetQSpacing_recipA() const;
|
|
|
|
[[nodiscard]] int32_t GetBinCount() const;
|
|
[[nodiscard]] int32_t GetQBinCount() const;
|
|
[[nodiscard]] int32_t GetAzimuthalBinCount() const;
|
|
[[nodiscard]] bool IsForceCPUinFPGAWorkflow() const;
|
|
|
|
[[nodiscard]] float GetBkgEstimateLowQ_recipA() const;
|
|
[[nodiscard]] float GetBkgEstimateHighQ_recipA() const;
|
|
[[nodiscard]] uint16_t QToBin(float q) const;
|
|
[[nodiscard]] uint16_t GetBin(float q, float phi_deg) const;
|
|
};
|
|
|