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

AzimuthalIntegrationMapping: Go back to old name, which was more logical for this object

Browse Source
This commit is contained in:
leonarski_f
2026-04-30 10:32:38 +02:00
parent 52d1f30a6a
commit 06d8fc3972
29 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
acquisition_device/AcquisitionDevice.cpp
+1 -1
View File
@@ -200,7 +200,7 @@ void AcquisitionDevice::InitializeEmptyPixelMask(const DiffractionExperiment &ex
void AcquisitionDevice::InitializeDataProcessing(const DiffractionExperiment &experiment,
const AzimuthalIntegration &azint) {
const AzimuthalIntegrationMapping &azint) {
auto offset = experiment.GetFirstModuleOfDataStream(data_stream);
size_t modules = experiment.GetModulesNum(data_stream);
acquisition_device/AcquisitionDevice.h
+2 -2
View File
@@ -21,7 +21,7 @@
#include "Completion.h"
#include "../fpga/pcie_driver/jfjoch_fpga.h"
#include "../common/NetworkAddressConvert.h"
#include "../common/AzimuthalIntegration.h"
#include "../common/AzimuthalIntegrationMapping.h"
struct AcquisitionDeviceStatistics {
uint64_t good_packets;
@@ -101,7 +101,7 @@ public:
void InitializePixelMask(const DiffractionExperiment &experiment, const PixelMask &mask_raw);
virtual void InitializePixelMask(const uint32_t *module_mask, size_t module_number);
void InitializeROIMap(const DiffractionExperiment& experiment, const std::vector<uint16_t>& raw_roi_map);
void InitializeDataProcessing(const DiffractionExperiment &experiment, const AzimuthalIntegration& azint);
void InitializeDataProcessing(const DiffractionExperiment &experiment, const AzimuthalIntegrationMapping& azint);
const AcquisitionCounters& Counters() const;
common/AzimuthalIntegration.cpp → common/AzimuthalIntegrationMapping.cpp
+22 -22
View File
@@ -3,12 +3,12 @@
#include <cmath>
#include "AzimuthalIntegration.h"
#include "AzimuthalIntegrationMapping.h"
#include "JFJochException.h"
#include "DiffractionGeometry.h"
#include "RawToConvertedGeometry.h"
AzimuthalIntegration::AzimuthalIntegration(const AzimuthalIntegrationSettings& in_settings, size_t width, size_t height,
AzimuthalIntegrationMapping::AzimuthalIntegrationMapping(const AzimuthalIntegrationSettings& in_settings, size_t width, size_t height,
float wavelength)
: settings(in_settings), width(width), height(height), wavelength(wavelength) {
if (width <= 0)
@@ -24,9 +24,9 @@ AzimuthalIntegration::AzimuthalIntegration(const AzimuthalIntegrationSettings& i
"Cannot handle more than 65534 az. int. bins");
}
AzimuthalIntegration::AzimuthalIntegration(const DiffractionExperiment &experiment,
AzimuthalIntegrationMapping::AzimuthalIntegrationMapping(const DiffractionExperiment &experiment,
const PixelMask& mask)
: AzimuthalIntegration(experiment.GetAzimuthalIntegrationSettings(),
: AzimuthalIntegrationMapping(experiment.GetAzimuthalIntegrationSettings(),
experiment.GetXPixelsNum(),
experiment.GetYPixelsNum(),
experiment.GetWavelength_A()) {
@@ -41,7 +41,7 @@ AzimuthalIntegration::AzimuthalIntegration(const DiffractionExperiment &experime
UpdateMaxBinNumber();
}
void AzimuthalIntegration::SetupConvGeom(const DiffractionGeometry &geom,
void AzimuthalIntegrationMapping::SetupConvGeom(const DiffractionGeometry &geom,
const std::vector<uint32_t> &mask) {
pixel_to_bin.resize(width * height, UINT16_MAX);
pixel_resolution.resize(width * height, 0);
@@ -54,7 +54,7 @@ void AzimuthalIntegration::SetupConvGeom(const DiffractionGeometry &geom,
SetupPixel(geom, mask, row * width + col, col, row);
}
void AzimuthalIntegration::SetupRawGeom(const DiffractionExperiment &experiment,
void AzimuthalIntegrationMapping::SetupRawGeom(const DiffractionExperiment &experiment,
const std::vector<uint32_t> &mask) {
if (mask.size() != RAW_MODULE_SIZE * experiment.GetModulesNum())
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Mask size invalid");
@@ -73,7 +73,7 @@ void AzimuthalIntegration::SetupRawGeom(const DiffractionExperiment &experiment,
}
}
void AzimuthalIntegration::SetupPixel(const DiffractionGeometry &geom,
void AzimuthalIntegrationMapping::SetupPixel(const DiffractionGeometry &geom,
const std::vector<uint32_t> &mask,
uint32_t pxl, uint32_t col, uint32_t row) {
if (mask[pxl] != 0)
@@ -99,35 +99,35 @@ void AzimuthalIntegration::SetupPixel(const DiffractionGeometry &geom,
}
}
uint16_t AzimuthalIntegration::GetBinNumber() const {
uint16_t AzimuthalIntegrationMapping::GetBinNumber() const {
return settings.GetBinCount();
}
const std::vector<uint16_t> &AzimuthalIntegration::GetPixelToBin() const {
const std::vector<uint16_t> &AzimuthalIntegrationMapping::GetPixelToBin() const {
return pixel_to_bin;
}
const std::vector<float> &AzimuthalIntegration::GetBinToQ() const {
const std::vector<float> &AzimuthalIntegrationMapping::GetBinToQ() const {
return bin_to_q;
}
const std::vector<float> &AzimuthalIntegration::GetBinToD() const {
const std::vector<float> &AzimuthalIntegrationMapping::GetBinToD() const {
return bin_to_d;
}
const std::vector<float> &AzimuthalIntegration::GetBinToTwoTheta() const {
const std::vector<float> &AzimuthalIntegrationMapping::GetBinToTwoTheta() const {
return bin_to_2theta;
}
const std::vector<float> &AzimuthalIntegration::GetBinToPhi() const {
const std::vector<float> &AzimuthalIntegrationMapping::GetBinToPhi() const {
return bin_to_phi;
}
uint16_t AzimuthalIntegration::QToBin(float q) const {
uint16_t AzimuthalIntegrationMapping::QToBin(float q) const {
return settings.QToBin(q);
}
void AzimuthalIntegration::UpdateMaxBinNumber() {
void AzimuthalIntegrationMapping::UpdateMaxBinNumber() {
bin_to_q.resize(settings.GetBinCount());
bin_to_d.resize(settings.GetBinCount());
bin_to_2theta.resize(settings.GetBinCount());
@@ -144,30 +144,30 @@ void AzimuthalIntegration::UpdateMaxBinNumber() {
}
}
const std::vector<float> &AzimuthalIntegration::Corrections() const {
const std::vector<float> &AzimuthalIntegrationMapping::Corrections() const {
return corrections;
}
const std::vector<float> &AzimuthalIntegration::Resolution() const {
const std::vector<float> &AzimuthalIntegrationMapping::Resolution() const {
return pixel_resolution;
}
const AzimuthalIntegrationSettings &AzimuthalIntegration::Settings() const {
const AzimuthalIntegrationSettings &AzimuthalIntegrationMapping::Settings() const {
return settings;
}
size_t AzimuthalIntegration::GetWidth() const {
size_t AzimuthalIntegrationMapping::GetWidth() const {
return width;
}
size_t AzimuthalIntegration::GetHeight() const {
size_t AzimuthalIntegrationMapping::GetHeight() const {
return height;
}
int32_t AzimuthalIntegration::GetAzimuthalBinCount() const {
int32_t AzimuthalIntegrationMapping::GetAzimuthalBinCount() const {
return settings.GetAzimuthalBinCount();
}
int32_t AzimuthalIntegration::GetQBinCount() const {
int32_t AzimuthalIntegrationMapping::GetQBinCount() const {
return settings.GetQBinCount();
}
common/AzimuthalIntegration.h → common/AzimuthalIntegrationMapping.h
+3 -3
View File
@@ -8,7 +8,7 @@
#include "DiffractionExperiment.h"
#include "PixelMask.h"
class AzimuthalIntegration {
class AzimuthalIntegrationMapping {
protected:
const AzimuthalIntegrationSettings settings;
const float wavelength;
@@ -26,7 +26,7 @@ protected:
std::optional<float> polarization_factor;
void UpdateMaxBinNumber();
AzimuthalIntegration(const AzimuthalIntegrationSettings& settings,
AzimuthalIntegrationMapping(const AzimuthalIntegrationSettings& settings,
size_t width, size_t height, float wavelength);
void SetupRawGeom(const DiffractionExperiment& experiment,
@@ -39,7 +39,7 @@ protected:
uint32_t pxl, uint32_t col, uint32_t row);
public:
AzimuthalIntegration(const DiffractionExperiment& experiment,
AzimuthalIntegrationMapping(const DiffractionExperiment& experiment,
const PixelMask& mask);
[[nodiscard]] uint16_t GetBinNumber() const;
common/AzimuthalIntegrationProfile.cpp
+2 -2
View File
@@ -11,7 +11,7 @@ inline float sum_to_count(float sum, uint64_t count) {
return sum / (static_cast<float>(count));
}
AzimuthalIntegrationProfile::AzimuthalIntegrationProfile(const AzimuthalIntegration &mapping)
AzimuthalIntegrationProfile::AzimuthalIntegrationProfile(const AzimuthalIntegrationMapping &mapping)
: sum(mapping.GetBinNumber(), 0),
sum2(mapping.GetBinNumber(), 0),
count(mapping.GetBinNumber(), 0),
@@ -23,7 +23,7 @@ AzimuthalIntegrationProfile::AzimuthalIntegrationProfile(const AzimuthalIntegrat
azim_bins(mapping.GetAzimuthalBinCount()) {
}
void AzimuthalIntegrationProfile::Clear(const AzimuthalIntegration &mapping) {
void AzimuthalIntegrationProfile::Clear(const AzimuthalIntegrationMapping &mapping) {
std::unique_lock ul(m);
bin_to_d = mapping.GetBinToD();
common/AzimuthalIntegrationProfile.h
+3 -3
View File
@@ -8,7 +8,7 @@
#include <mutex>
#include "MultiLinePlot.h"
#include "AzimuthalIntegration.h"
#include "AzimuthalIntegrationMapping.h"
#include "../acquisition_device/AcquisitionDevice.h"
class AzimuthalIntegrationProfile {
@@ -28,8 +28,8 @@ class AzimuthalIntegrationProfile {
const std::vector<float>& GetXAxis(PlotAzintUnit unit) const;
public:
explicit AzimuthalIntegrationProfile(const AzimuthalIntegration &mapping);
void Clear(const AzimuthalIntegration &mapping);
explicit AzimuthalIntegrationProfile(const AzimuthalIntegrationMapping &mapping);
void Clear(const AzimuthalIntegrationMapping &mapping);
void SetTitle(const std::string& input);
void Add(const DeviceOutput &result);
void Add(const std::vector<float> &sum, const std::vector<uint32_t> &count);
common/CMakeLists.txt
+2 -2
View File
@@ -72,8 +72,8 @@ ADD_LIBRARY(JFJochCommon STATIC
AzimuthalIntegrationSettings.h
AzimuthalIntegrationProfile.h
AzimuthalIntegrationProfile.cpp
AzimuthalIntegration.h
AzimuthalIntegration.cpp
AzimuthalIntegrationMapping.h
AzimuthalIntegrationMapping.cpp
CheckPath.h
AutoIncrVector.h
ModuleSummation.cpp
image_analysis/MXAnalysisWithoutFPGA.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
MXAnalysisWithoutFPGA::MXAnalysisWithoutFPGA(const DiffractionExperiment &in_experiment,
const AzimuthalIntegration &in_integration,
const AzimuthalIntegrationMapping &in_integration,
const PixelMask &in_mask,
IndexAndRefine &in_indexer)
: experiment(in_experiment),
image_analysis/MXAnalysisWithoutFPGA.h
+3 -3
View File
@@ -8,7 +8,7 @@
#include "../common/JFJochMessages.h"
#include "../common/DiffractionExperiment.h"
#include "../common/AzimuthalIntegration.h"
#include "../common/AzimuthalIntegrationMapping.h"
#include "../common/PixelMask.h"
#include "../common/AzimuthalIntegrationProfile.h"
#include "bragg_prediction/BraggPrediction.h"
@@ -22,7 +22,7 @@
// MXAnalysisWithoutFPGA is not thread safe - it has to owned by a single thread
class MXAnalysisWithoutFPGA {
const DiffractionExperiment &experiment;
const AzimuthalIntegration &integration;
const AzimuthalIntegrationMapping &integration;
std::vector<uint8_t> decompression_buffer;
@@ -43,7 +43,7 @@ class MXAnalysisWithoutFPGA {
float mask_low_res;
void UpdateMaskResolution(const SpotFindingSettings& settings);
public:
MXAnalysisWithoutFPGA(const DiffractionExperiment &experiment, const AzimuthalIntegration &integration,
MXAnalysisWithoutFPGA(const DiffractionExperiment &experiment, const AzimuthalIntegrationMapping &integration,
const PixelMask &mask, IndexAndRefine &indexer);
void Analyze(DataMessage &output, AzimuthalIntegrationProfile &profile, const SpotFindingSettings &spot_finding_settings);
};
image_analysis/azint/AzIntEngine.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include "AzIntEngine.h"
AzIntEngine::AzIntEngine(const AzimuthalIntegration &integration)
AzIntEngine::AzIntEngine(const AzimuthalIntegrationMapping &integration)
: integration(integration),
npixel(integration.GetPixelToBin().size()),
azint_sum(integration.GetBinNumber(), 0.0f),
image_analysis/azint/AzIntEngine.h
+3 -3
View File
@@ -3,7 +3,7 @@
#pragma once
#include "../../common/AzimuthalIntegration.h"
#include "../../common/AzimuthalIntegrationMapping.h"
#include "../../common/AzimuthalIntegrationProfile.h"
#include "../image_preprocessing/ImagePreprocessorBuffer.h"
@@ -11,12 +11,12 @@ class AzIntEngine {
protected:
const uint16_t azint_bins;
const size_t npixel;
const AzimuthalIntegration& integration;
const AzimuthalIntegrationMapping& integration;
std::vector<float> azint_sum;
std::vector<float> azint_sum2;
std::vector<uint32_t> azint_count;
public:
AzIntEngine(const AzimuthalIntegration& integration);
AzIntEngine(const AzimuthalIntegrationMapping& integration);
virtual ~AzIntEngine() = default;
virtual void Run(const ImagePreprocessorBuffer &image, AzimuthalIntegrationProfile &profile) = 0;
};
image_analysis/azint/AzIntEngineCPU.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include "AzIntEngineCPU.h"
AzIntEngineCPU::AzIntEngineCPU(const AzimuthalIntegration &integration)
AzIntEngineCPU::AzIntEngineCPU(const AzimuthalIntegrationMapping &integration)
: AzIntEngine(integration) {}
void AzIntEngineCPU::Run(const ImagePreprocessorBuffer &image, AzimuthalIntegrationProfile &profile){
image_analysis/azint/AzIntEngineCPU.h
+1 -1
View File
@@ -7,6 +7,6 @@
class AzIntEngineCPU : public AzIntEngine {
public:
AzIntEngineCPU(const AzimuthalIntegration& integration);
AzIntEngineCPU(const AzimuthalIntegrationMapping& integration);
void Run(const ImagePreprocessorBuffer &image, AzimuthalIntegrationProfile &profile) override;
};
image_analysis/azint/AzIntEngineGPU.cu
+1 -1
View File
@@ -88,7 +88,7 @@ void gpu_azim(
}
}
AzIntEngineGPU::AzIntEngineGPU(const AzimuthalIntegration &integration, std::shared_ptr<CudaStream> stream)
AzIntEngineGPU::AzIntEngineGPU(const AzimuthalIntegrationMapping &integration, std::shared_ptr<CudaStream> stream)
: AzIntEngine(integration),
stream(stream),
gpu_azint_correction(npixel),
image_analysis/azint/AzIntEngineGPU.h
+1 -1
View File
@@ -23,6 +23,6 @@ class AzIntEngineGPU : public AzIntEngine {
CudaRegisteredVector<float> cpu_sum2_reg;
CudaRegisteredVector<uint32_t> cpu_count_reg;
public:
AzIntEngineGPU(const AzimuthalIntegration& integration, std::shared_ptr<CudaStream> stream);
AzIntEngineGPU(const AzimuthalIntegrationMapping& integration, std::shared_ptr<CudaStream> stream);
void Run(const ImagePreprocessorBuffer &image, AzimuthalIntegrationProfile &profile) override;
};
image_analysis/spot_finding/ImageSpotFinderCPU.h
+1 -1
View File
@@ -10,7 +10,7 @@
#include "ImageSpotFinder.h"
#include "SpotFindingSettings.h"
#include "../../common/AzimuthalIntegration.h"
#include "../../common/AzimuthalIntegrationMapping.h"
#include "../../common/DiffractionSpot.h"
// This is "slow" spot finder for image-based analysis
reader/JFJochReaderDataset.h
+1 -1
View File
@@ -11,7 +11,7 @@
#include "../common/DiffractionGeometry.h"
#include "../common/DiffractionExperiment.h"
#include "../common/PixelMask.h"
#include "../common/AzimuthalIntegration.h"
#include "../common/AzimuthalIntegrationMapping.h"
struct JFJochReaderDataset {
std::string arm_date;
receiver/JFJochReceiver.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ JFJochReceiver::JFJochReceiver(const DiffractionExperiment &in_experiment,
current_status.SetStatus(JFJochReceiverStatus{}); // GetStatus() is virtual function and cannot be called yet!
auto start_time_point = std::chrono::steady_clock::now();
az_int_mapping = std::make_unique<AzimuthalIntegration>(experiment, pixel_mask);
az_int_mapping = std::make_unique<AzimuthalIntegrationMapping>(experiment, pixel_mask);
auto end_time_point = std::chrono::steady_clock::now();
auto duration = std::chrono::duration<float>(end_time_point - start_time_point);
logger.Info("Azimuthal integration mapping done in {:.5f} s", duration.count());
receiver/JFJochReceiver.h
+1 -1
View File
@@ -82,7 +82,7 @@ protected:
std::vector<std::unique_ptr<ADUHistogram>> adu_histogram_module;
PixelMask pixel_mask;
std::unique_ptr<AzimuthalIntegration> az_int_mapping;
std::unique_ptr<AzimuthalIntegrationMapping> az_int_mapping;
std::optional<uint64_t> max_delay;
std::mutex max_delay_mutex;
receiver/JFJochReceiverFPGA.h
+1 -1
View File
@@ -24,7 +24,7 @@
#include "../common/PixelMask.h"
#include "../image_analysis/spot_finding/StrongPixelSet.h"
#include "../common/AzimuthalIntegration.h"
#include "../common/AzimuthalIntegrationMapping.h"
#include "../common/AzimuthalIntegrationProfile.h"
#include "../jungfrau/JFCalibration.h"
receiver/JFJochReceiverPlots.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ MultiLinePlot JFJochReceiverPlots::GetROIPlot(PlotType type, int64_t nbins, floa
return ret;
}
void JFJochReceiverPlots::Setup(const DiffractionExperiment &experiment, const AzimuthalIntegration &mapping) {
void JFJochReceiverPlots::Setup(const DiffractionExperiment &experiment, const AzimuthalIntegrationMapping &mapping) {
std::unique_lock ul(m);
az_int_profile = std::make_unique<AzimuthalIntegrationProfile>(mapping);
receiver/JFJochReceiverPlots.h
+1 -1
View File
@@ -104,7 +104,7 @@ class JFJochReceiverPlots {
MultiLinePlot GetROIPlot(PlotType type, int64_t nbins, float start, float incr,
const std::optional<float> &fill_value) const;
public:
void Setup(const DiffractionExperiment& experiment, const AzimuthalIntegration& mapping);
void Setup(const DiffractionExperiment& experiment, const AzimuthalIntegrationMapping& mapping);
void Add(const DataMessage& msg, const AzimuthalIntegrationProfile &profile);
void AddEmptyImage(const DataMessage& msg);
tests/AzimuthalIntegrationTest.cpp
+15 -15
View File
@@ -4,19 +4,19 @@
#include <catch2/catch_all.hpp>
#include "../common/AzimuthalIntegrationProfile.h"
#include "../common/AzimuthalIntegration.h"
#include "../common/AzimuthalIntegrationMapping.h"
TEST_CASE("AzimuthalIntegrationMapping_Constructor","[AzimuthalIntegration]") {
DiffractionExperiment x(DetJF4M());
REQUIRE(x.GetPixelsNum() == 2164*2068);
std::unique_ptr<AzimuthalIntegration> radial;
std::unique_ptr<AzimuthalIntegrationMapping> radial;
x.QSpacingForAzimInt_recipA(0.1).QRangeForAzimInt_recipA(0.1, 5);
PixelMask pixel_mask(x);
REQUIRE_NOTHROW(radial = std::make_unique<AzimuthalIntegration>(x, pixel_mask));
REQUIRE_NOTHROW(radial = std::make_unique<AzimuthalIntegrationMapping>(x, pixel_mask));
}
TEST_CASE("AzimuthalIntegrationMapping_Create_16M","[AzimuthalIntegration]") {
@@ -25,7 +25,7 @@ TEST_CASE("AzimuthalIntegrationMapping_Create_16M","[AzimuthalIntegration]") {
x.QSpacingForAzimInt_recipA(0.1).QRangeForAzimInt_recipA(0.1, 10);
PixelMask pixel_mask(x);
AzimuthalIntegration mapping(x, pixel_mask);
AzimuthalIntegrationMapping mapping(x, pixel_mask);
REQUIRE(mapping.GetBinNumber() == 99);
}
@@ -35,7 +35,7 @@ TEST_CASE("AzimuthalIntegrationMapping_GetBinNumber","[AzimuthalIntegration]") {
x.QSpacingForAzimInt_recipA(0.1).QRangeForAzimInt_recipA(0.1, 4);
PixelMask pixel_mask(x);
AzimuthalIntegration mapping(x, pixel_mask);
AzimuthalIntegrationMapping mapping(x, pixel_mask);
REQUIRE(mapping.GetBinNumber() == 39);
}
@@ -57,7 +57,7 @@ TEST_CASE("AzimuthalIntegrationMapping_GetBinNumber_mask","[AzimuthalIntegration
PixelMask pixel_mask_obj(x);
pixel_mask_obj.LoadUserMask(x, pixel_mask);
AzimuthalIntegration mapping(x, pixel_mask_obj);
AzimuthalIntegrationMapping mapping(x, pixel_mask_obj);
REQUIRE(mapping.GetBinNumber() == 89);
}
@@ -67,7 +67,7 @@ TEST_CASE("AzimuthalIntegrationMapping_GetBinNumber_DetectorLimit","[AzimuthalIn
x.QSpacingForAzimInt_recipA(0.1).QRangeForAzimInt_recipA(0.1, 9.9);
PixelMask pixel_mask(x);
AzimuthalIntegration mapping(x, pixel_mask);
AzimuthalIntegrationMapping mapping(x, pixel_mask);
REQUIRE(mapping.GetBinNumber() == 98);
}
@@ -78,7 +78,7 @@ TEST_CASE("AzimuthalIntegrationMapping_GetBinToQ","[AzimuthalIntegration]") {
x.QSpacingForAzimInt_recipA(0.1).QRangeForAzimInt_recipA(0.1, 4);
PixelMask pixel_mask(x);
AzimuthalIntegration mapping(x, pixel_mask);
AzimuthalIntegrationMapping mapping(x, pixel_mask);
auto bin_to_q = mapping.GetBinToQ();
@@ -99,7 +99,7 @@ TEST_CASE("AzimuthalIntegrationMapping_GetBinToPhi","[AzimuthalIntegration]") {
x.ImportAzimuthalIntegrationSettings(settings);
PixelMask pixel_mask(x);
AzimuthalIntegration mapping(x, pixel_mask);
AzimuthalIntegrationMapping mapping(x, pixel_mask);
auto &bin_to_q = mapping.GetBinToQ();
@@ -144,7 +144,7 @@ TEST_CASE("AzimuthalIntegrationMapping_GetMapping","[AzimuthalIntegration]") {
x.ImportAzimuthalIntegrationSettings(settings);
PixelMask pixel_mask(x);
AzimuthalIntegration mapping(x, pixel_mask);
AzimuthalIntegrationMapping mapping(x, pixel_mask);
auto map = mapping.GetPixelToBin();
@@ -163,7 +163,7 @@ TEST_CASE("AzimuthalIntegrationMapping_QToBin","[AzimuthalIntegration]") {
x.QSpacingForAzimInt_recipA(0.1).QRangeForAzimInt_recipA(0.1, 4);
PixelMask pixel_mask(x);
AzimuthalIntegration mapping(x, pixel_mask);
AzimuthalIntegrationMapping mapping(x, pixel_mask);
REQUIRE(mapping.QToBin(0.0) == 0);
REQUIRE(std::floor(mapping.QToBin(0.200001)) == 1);
@@ -177,7 +177,7 @@ TEST_CASE("AzimuthalIntegrationProfile","[AzimuthalIntegration]") {
x.QSpacingForAzimInt_recipA(0.1).QRangeForAzimInt_recipA(0.1, 4);
PixelMask pixel_mask(x);
AzimuthalIntegration mapping(x, pixel_mask);
AzimuthalIntegrationMapping mapping(x, pixel_mask);
AzimuthalIntegrationProfile profile(mapping);
@@ -214,7 +214,7 @@ TEST_CASE("AzimuthalIntegrationProfile_operatorAdd","[AzimuthalIntegration]") {
x.QSpacingForAzimInt_recipA(0.1).QRangeForAzimInt_recipA(0.1, 4);
PixelMask pixel_mask(x);
AzimuthalIntegration mapping(x, pixel_mask);
AzimuthalIntegrationMapping mapping(x, pixel_mask);
AzimuthalIntegrationProfile profile0(mapping), profile1(mapping);
@@ -245,7 +245,7 @@ TEST_CASE("AzimuthalIntegrationProfile_GetMeanValueOfBins","[AzimuthalIntegratio
x.QSpacingForAzimInt_recipA(0.1).QRangeForAzimInt_recipA(0.1, 4);
PixelMask pixel_mask(x);
AzimuthalIntegration mapping(x, pixel_mask);
AzimuthalIntegrationMapping mapping(x, pixel_mask);
AzimuthalIntegrationProfile profile(mapping);
@@ -278,7 +278,7 @@ TEST_CASE("AzimuthalIntegrationProfile_GetResult1D","[AzimuthalIntegration]") {
x.ImportAzimuthalIntegrationSettings(settings);
PixelMask pixel_mask(x);
AzimuthalIntegration mapping(x, pixel_mask);
AzimuthalIntegrationMapping mapping(x, pixel_mask);
AzimuthalIntegrationProfile profile(mapping);
REQUIRE(mapping.GetQBinCount() == 3);
tests/HDF5WritingTest.cpp
+3 -3
View File
@@ -442,7 +442,7 @@ TEST_CASE("HDF5MasterFile_RadInt", "[HDF5][Full]") {
x.FilePrefix("test01_rad_int").ImagesPerTrigger(950);
PixelMask pixel_mask(x);
AzimuthalIntegration mapping(x, pixel_mask);
AzimuthalIntegrationMapping mapping(x, pixel_mask);
AzimuthalIntegrationProfile profile(mapping);
StartMessage start_message;
@@ -622,7 +622,7 @@ TEST_CASE("HDF5Writer_Rad_Int_Profile", "[HDF5][Full]") {
x.QSpacingForAzimInt_recipA(0.1).QRangeForAzimInt_recipA(0.1, 4.0);
PixelMask pixel_mask(x);
AzimuthalIntegration mapping(x, pixel_mask);
AzimuthalIntegrationMapping mapping(x, pixel_mask);
std::vector<float> rad_int_profile(mapping.GetBinNumber(), 4.0);
std::vector<float> rad_int_avg(mapping.GetBinNumber(), 0.33);
@@ -989,7 +989,7 @@ TEST_CASE("HDF5Writer_NXmxIntegrated_AzInt", "[HDF5][Full]") {
x.SetFileWriterFormat(FileWriterFormat::NXmxIntegrated).OverwriteExistingFiles(true);
PixelMask pixel_mask(x);
AzimuthalIntegration mapping(x, pixel_mask);
AzimuthalIntegrationMapping mapping(x, pixel_mask);
{
RegisterHDF5Filter();
tests/JFJochReaderTest.cpp
+2 -2
View File
@@ -949,7 +949,7 @@ TEST_CASE("JFJochReader_Azint", "[HDF5][Full]") {
std::vector<uint16_t> image(x.GetPixelsNum());
AzimuthalIntegration azint(x, PixelMask(x));
AzimuthalIntegrationMapping azint(x, PixelMask(x));
RegisterHDF5Filter();
{
StartMessage start_message;
@@ -1433,7 +1433,7 @@ TEST_CASE("JFJochReader_NXmxIntegrated", "[HDF5][Full]") {
image[1] = 123;
image[5678] = 321;
AzimuthalIntegration azint(x, PixelMask(x));
AzimuthalIntegrationMapping azint(x, PixelMask(x));
RegisterHDF5Filter();
{
tests/JFJochReceiverPlotsTest.cpp
+3 -3
View File
@@ -9,7 +9,7 @@ TEST_CASE("JFJochReceiverPlots") {
experiment.Goniometer(GoniometerAxis("omega", 15, 2, Coord(0,1,0), {}));
PixelMask mask(experiment);
AzimuthalIntegration integration(experiment, mask);
AzimuthalIntegrationMapping integration(experiment, mask);
JFJochReceiverPlots plots;
plots.Setup(experiment, integration);
@@ -48,7 +48,7 @@ TEST_CASE("JFJochReceiverPlots_Angle") {
experiment.Goniometer(GoniometerAxis("omega", 15, 2, Coord(0,1,0), {}));
PixelMask mask(experiment);
AzimuthalIntegration integration(experiment, mask);
AzimuthalIntegrationMapping integration(experiment, mask);
JFJochReceiverPlots plots;
plots.Setup(experiment, integration);
@@ -91,7 +91,7 @@ TEST_CASE("JFJochReceiverPlots_Grid") {
experiment.ImportDatasetSettings(dataset);
PixelMask mask(experiment);
AzimuthalIntegration integration(experiment, mask);
AzimuthalIntegrationMapping integration(experiment, mask);
JFJochReceiverPlots plots;
plots.Setup(experiment, integration);
tools/jfjoch_process.cpp
+2 -2
View File
@@ -16,7 +16,7 @@
#include "../common/Logger.h"
#include "../common/DiffractionExperiment.h"
#include "../common/PixelMask.h"
#include "../common/AzimuthalIntegration.h"
#include "../common/AzimuthalIntegrationMapping.h"
#include "../common/time_utc.h"
#include "../common/print_license.h"
#include "../image_analysis/MXAnalysisWithoutFPGA.h"
@@ -346,7 +346,7 @@ int main(int argc, char **argv) {
// If dataset has a mask you wish to use, you might need to load it into pixel_mask here
// e.g. pixel_mask.LoadUserMask(dataset->pixel_mask, ...);
AzimuthalIntegration mapping(experiment, pixel_mask);
AzimuthalIntegrationMapping mapping(experiment, pixel_mask);
IndexerThreadPool indexer_pool(experiment.GetIndexingSettings());
// Statistics collector
viewer/JFJochImageReadingWorker.cpp
+1 -1
View File
@@ -296,7 +296,7 @@ void JFJochImageReadingWorker::LoadImage(int64_t image_number, int64_t summation
void JFJochImageReadingWorker::UpdateAzint_i(const JFJochReaderDataset *dataset) {
if (dataset) {
azint_mapping = std::make_unique<AzimuthalIntegration>(curr_experiment, dataset->pixel_mask);
azint_mapping = std::make_unique<AzimuthalIntegrationMapping>(curr_experiment, dataset->pixel_mask);
index_and_refine = std::make_unique<IndexAndRefine>(curr_experiment, indexing.get());
image_analysis = std::make_unique<MXAnalysisWithoutFPGA>(curr_experiment, *azint_mapping, dataset->pixel_mask,
*index_and_refine.get());
viewer/JFJochImageReadingWorker.h
+1 -1
View File
@@ -52,7 +52,7 @@ private:
std::unique_ptr<IndexerThreadPool> indexing;
std::shared_ptr<JFJochReaderImage> current_image_ptr;
std::unique_ptr<AzimuthalIntegration> azint_mapping;
std::unique_ptr<AzimuthalIntegrationMapping> azint_mapping;
std::unique_ptr<MXAnalysisWithoutFPGA> image_analysis;
std::unique_ptr<IndexAndRefine> index_and_refine;