diff --git a/image_analysis/RadialIntegrationMapping.cpp b/image_analysis/RadialIntegrationMapping.cpp index 3f0833dc..6da3f21a 100644 --- a/image_analysis/RadialIntegrationMapping.cpp +++ b/image_analysis/RadialIntegrationMapping.cpp @@ -6,7 +6,7 @@ #include "../common/JFJochException.h" #include "../common/DiffractionGeometry.h" -RadialIntegrationMapping::RadialIntegrationMapping(const DiffractionExperiment& experiment, const uint8_t *one_byte_mask) : +RadialIntegrationMapping::RadialIntegrationMapping(const DiffractionExperiment& experiment) : low_q(experiment.GetLowQForRadialInt_recipA()), high_q(experiment.GetHighQForRadialInt_recipA()), q_spacing(experiment.GetQSpacingForRadialInt_recipA()), @@ -35,9 +35,7 @@ RadialIntegrationMapping::RadialIntegrationMapping(const DiffractionExperiment& int64_t pixel_number = y * experiment.GetXPixelsNum() + x; double pixel_q = 2 * M_PI / PxlToRes(experiment, x, y); - if (((one_byte_mask != nullptr) && (one_byte_mask[pixel_number] == 0)) - || (pixel_q < low_q) - || (pixel_q >= high_q)) + if ((pixel_q < low_q) || (pixel_q >= high_q)) pixel_to_bin[pixel_number] = UINT16_MAX; else pixel_to_bin[pixel_number] = std::floor((pixel_q - low_q) / q_spacing); diff --git a/image_analysis/RadialIntegrationMapping.h b/image_analysis/RadialIntegrationMapping.h index b2ef16f5..a2d1d7c3 100644 --- a/image_analysis/RadialIntegrationMapping.h +++ b/image_analysis/RadialIntegrationMapping.h @@ -13,7 +13,7 @@ class RadialIntegrationMapping { std::vector pixel_to_bin; uint16_t max_bin_number; public: - RadialIntegrationMapping(const DiffractionExperiment& experiment, const uint8_t *one_byte_mask = nullptr); + RadialIntegrationMapping(const DiffractionExperiment& experiment); [[nodiscard]] uint16_t GetBinNumber() const; [[nodiscard]] const std::vector &GetPixelToBinMapping() const; [[nodiscard]] const std::vector &GetBinToQ() const; diff --git a/receiver/JFJochReceiver.cpp b/receiver/JFJochReceiver.cpp index d8179130..cd43de36 100644 --- a/receiver/JFJochReceiver.cpp +++ b/receiver/JFJochReceiver.cpp @@ -90,7 +90,7 @@ JFJochReceiver::JFJochReceiver(const JFJochProtoBuf::ReceiverInput &settings, if (!GPUImageAnalysis::GPUPresent()) logger.Info("GPU support missing"); - rad_int_mapping = std::make_unique(experiment, one_byte_mask.data()); + rad_int_mapping = std::make_unique(experiment); rad_int_profile = std::make_unique(*rad_int_mapping, experiment); rad_int_corr = CalcRadIntCorr(experiment); diff --git a/tests/RadialIntegrationTest.cpp b/tests/RadialIntegrationTest.cpp index 42f69480..dc9c3c4c 100644 --- a/tests/RadialIntegrationTest.cpp +++ b/tests/RadialIntegrationTest.cpp @@ -24,24 +24,6 @@ TEST_CASE("RadialIntegrationMappingFPGA_Constructor","[RadialIntegration]") { REQUIRE_NOTHROW(radial = std::make_unique(x, 0)); } -TEST_CASE("RadialIntegrationMapping_Constructor_Mask","[RadialIntegration]") { - DiffractionExperiment x(DetectorGeometry(8, 2, 8, 36)); - - x.DetectorDistance_mm(50).BeamX_pxl(1000).BeamY_pxl(1000); - x.QSpacingForRadialInt_recipA(0.1).LowQForRadialInt_recipA(0.001).HighQForRadialInt_recipA(9.9); - - std::vector one_byte_mask(x.GetPixelsNum(), 1); - one_byte_mask[456*1030+234] = 0; - one_byte_mask[800*1030+74] = 0; - - std::unique_ptr radial; - - REQUIRE_NOTHROW(radial = std::make_unique(x, one_byte_mask.data())); - REQUIRE(radial->GetPixelToBinMapping()[1030*512+344] != UINT16_MAX); - REQUIRE(radial->GetPixelToBinMapping()[456*1030+234] == UINT16_MAX); - REQUIRE(radial->GetPixelToBinMapping()[800*1030+74] == UINT16_MAX); -} - TEST_CASE("RadialIntegrationMapping_GetBinNumber","[RadialIntegration]") { DiffractionExperiment x(DetectorGeometry(8, 2, 8, 36)); x.DetectorDistance_mm(50).BeamX_pxl(1000).BeamY_pxl(1000); diff --git a/tools/RadialIntDataset.cpp b/tools/RadialIntDataset.cpp index 956d5ef2..d8b13f18 100644 --- a/tools/RadialIntDataset.cpp +++ b/tools/RadialIntDataset.cpp @@ -82,7 +82,8 @@ int main(int argc, char **argv) { GetGeometry(x, master_file); - RadialIntegrationMapping rad_int_map(x, one_byte_mask.data()); + //TODO: Setup Mask + RadialIntegrationMapping rad_int_map(x); RadialIntegration rad_int(rad_int_map); CalcRadialIntegration(x, rad_int, argv[2], first, last);