Calculate fitting results for beam deconvolved images

CMakeLists.txt

@@ -229,6 +229,8 @@ set(SOURCE_FILES
         src/ImageData/Hdf5Loader.cc
         src/ImageData/PolarizationCalculator.cc
         src/ImageData/StokesFilesConnector.cc
+        src/ImageFitter/Deconvolver.cc
+        src/ImageFitter/ImageFitter.cc
         src/ImageGenerators/MomentGenerator.cc
         src/ImageGenerators/PvGenerator.cc
         src/ImageGenerators/PvPreviewCube.cc
@@ -264,8 +266,7 @@ set(SOURCE_FILES
         src/Util/Message.cc
         src/Util/Stokes.cc
         src/Util/String.cc
-        src/Util/Token.cc
-        src/ImageFitter/ImageFitter.cc)
+        src/Util/Token.cc)
 
 add_definitions(-DHAVE_HDF5 -DPUGIXML_COMPACT)
 add_executable(carta_backend ${SOURCE_FILES})

src/Frame/Frame.cc

@@ -1849,7 +1849,9 @@ bool Frame::FitImage(const CARTA::FittingRequest& fitting_request, CARTA::Fittin
 
         if (stokes_region != nullptr) {
             casacore::IPosition region_shape = GetRegionShape(*stokes_region);
-            spdlog::info("Creating region subimage data with shape {} x {}.", region_shape(0), region_shape(1));
+            size_t width = region_shape(0);
+            size_t height = region_shape(1);
+            spdlog::info("Creating region subimage data with shape {} x {}.", width, height);
 
             std::vector<float> region_data;
             if (!GetRegionData(*stokes_region, region_data)) {
@@ -1862,15 +1864,22 @@ bool Frame::FitImage(const CARTA::FittingRequest& fitting_request, CARTA::Fittin
             casacore::IPosition origin(2, 0, 0);
             casacore::IPosition region_origin = stokes_region->image_region.asLCRegion().expand(origin);
 
-            success = _image_fitter->FitImage(region_shape(0), region_shape(1), region_data.data(), beam_size, unit, initial_values,
-                fixed_params, fitting_request.offset(), fitting_request.solver(), fitting_request.create_model_image(),
+            success = _image_fitter->FitImage(width, height, region_data.data(), beam_size, unit, initial_values, fixed_params,
+                fitting_request.offset(), fitting_request.solver(), fitting_request.create_model_image(),
                 fitting_request.create_residual_image(), fitting_response, progress_callback, region_origin(0), region_origin(1));
+            if (success) {
+                _image_fitter->GetDeconvolvedResults(
+                    image, width, height, CurrentZ(), CurrentStokes(), fitting_response, region_origin(0), region_origin(1));
+            }
         } else {
             FillImageCache();
 
             success = _image_fitter->FitImage(_width, _height, _image_cache.get(), beam_size, unit, initial_values, fixed_params,
                 fitting_request.offset(), fitting_request.solver(), fitting_request.create_model_image(),
                 fitting_request.create_residual_image(), fitting_response, progress_callback);
+            if (success) {
+                _image_fitter->GetDeconvolvedResults(image, _width, _height, CurrentZ(), CurrentStokes(), fitting_response);
+            }
         }
 
         if (success && (fitting_request.create_model_image() || fitting_request.create_residual_image())) {
@@ -1881,9 +1890,9 @@ bool Frame::FitImage(const CARTA::FittingRequest& fitting_request, CARTA::Fittin
             } else {
                 GetImageRegion(file_id, AxisRange(CurrentZ()), CurrentStokes(), output_stokes_region);
             }
-            casa::SPIIF image(_loader->GetStokesImage(output_stokes_region.stokes_source));
+            casa::SPIIF in_image(_loader->GetStokesImage(output_stokes_region.stokes_source));
             success = _image_fitter->GetGeneratedImages(
-                image, output_stokes_region.image_region, GetFileName(), model_image, residual_image, fitting_response);
+                in_image, output_stokes_region.image_region, GetFileName(), model_image, residual_image, fitting_response);
         }
     }
 

src/Frame/Frame.h

@@ -4,8 +4,8 @@
    SPDX-License-Identifier: GPL-3.0-or-later
 */
 
-//# Frame.h: represents an open image file.  Handles slicing data and region calculations
-//# (profiles, histograms, stats)
+// # Frame.h: represents an open image file.  Handles slicing data and region calculations
+// # (profiles, histograms, stats)
 
 #ifndef CARTA_SRC_FRAME_FRAME_H_
 #define CARTA_SRC_FRAME_FRAME_H_
@@ -23,6 +23,7 @@
 #include "DataStream/Tile.h"
 #include "DataStream/VectorField.h"
 #include "ImageData/FileLoader.h"
+#include "ImageFitter/Deconvolver.h"
 #include "ImageFitter/ImageFitter.h"
 #include "ImageGenerators/ImageGenerator.h"
 #include "ImageGenerators/MomentGenerator.h"