Release 1.1.0

.gitignore

@@ -11,3 +11,4 @@ __pycache__
 /packages
 /doc/build/
 /build/
+.vscode

CMakeLists.txt

@@ -1,9 +1,9 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
 
 #---------------------------------------------------------------
 # Load macros and functions for Elements-based projects
 find_package(ElementsProject)
 #---------------------------------------------------------------
 
 # Declare project name and version
-elements_project(SourceXtractorPlusPlus 1.0.3 USE Alexandria 2.32.0 DESCRIPTION "SourceXtractor++, the next generation SExtractor")
+elements_project(SourceXtractorPlusPlus 1.1.0 USE Alexandria 2.33.0 DESCRIPTION "SourceXtractor++, the next generation SExtractor")

ModelFitting/ModelFitting/Parameters/DependentParameter.h

@@ -65,7 +65,11 @@ class DependentParameter: public BasicParameter {
     //m_get_value_hook = std::bind(&DependentParameter::getValueHook, this);
   }
 
-  virtual ~DependentParameter() = default;
+  virtual ~DependentParameter() {
+    for (auto& parameter_observer : m_parameter_observers) {
+      std::get<0>(parameter_observer)->removeObserver(std::get<1>(parameter_observer));
+    }
+  }
 
   double getValue() const override {
     if (!this->isObserved()) {
@@ -118,13 +122,17 @@ class DependentParameter: public BasicParameter {
 
   template<typename Param>
   void addParameterObserver(int, Param& param) {
-    param->addObserver([this](double){
+    auto id = param->addObserver([this](double){
       // Do not bother updating live if there are no observers
       if (this->isObserved()) {
           this->update((*m_params)[0]->getValue());
       }
     });
+
+    m_parameter_observers.emplace_back(param, id);
   }
+
+  std::vector<std::tuple<std::shared_ptr<BasicParameter>, size_t>> m_parameter_observers;
 };
 
 template<typename ... Parameters>
@@ -133,6 +141,7 @@ std::shared_ptr<DependentParameter<Parameters...>> createDependentParameter(
   return std::make_shared<DependentParameter<Parameters...>>(value_calculator, parameters...);
 }
 
+
 }
 
 #endif  /* MODELFITTING_DEPENDENTPARAMETER_H */

README.md

@@ -17,13 +17,13 @@ Documentation: https://astrorama.github.io/SourceXtractorPlusPlus/
 SourceXtractor++ is available on [Anaconda Cloud for Linux and MacOSX](https://anaconda.org/astrorama/sourcextractor)
 
 ```bash
-conda install -c conda-forge -c astrorama sourcextractor==1.0.2
+conda install -c conda-forge -c astrorama sourcextractor==1.1.0
  ```
 
 We would recommend, however, to install it into its own environment.
 
 ```bash
-conda create -n sourcex -c astrorama -c conda-forge sourcextractor==1.0.2
+conda create -n sourcex -c astrorama -c conda-forge sourcextractor==1.1.0
 conda activate sourcex
  ```
 
@@ -36,47 +36,9 @@ conda activate sourcex-dev
 
 We recommend always using an explicit version number as there is no guarantee that `conda` will install the latest version otherwise.
 
-## Fedora
+Fedora and RPM
 
-SourceXtractor++ is shipped directly in Fedora. It can be installed simply as follows:
-
-```bash
-sudo dnf install sourcextractor++
-```
-
-[We also build our own RPMs as part of our CI setup](http://repository.astro.unige.ch/euclid/)
-They can be installed adding a `.repo` file under `/etc/yum.repos.d` with the following content:
-
-```ini
-# Stable and tagged versions
-# This is the recommended way to install sourcextractor++
-[Astrorama]
-name=Astrorama
-baseurl=http://repository.astro.unige.ch/euclid/fedora/$releasever/$basearch
-enabled=1
-gpgcheck=0
-
-# Enable this to get the stable (untagged) version
-[Astrorama-Stable]
-name=Astrorama Stable
-baseurl=http://repository.astro.unige.ch/euclid/devel/stable/fedora/$releasever/$basearch
-enabled=0
-gpgcheck=0
-
-# Enable this to get the development version
-# Use with care!
-[Astrorama-Develop]
-name=Astrorama Develop
-baseurl=http://repository.astro.unige.ch/euclid/devel/develop/fedora/$releasever/$basearch
-enabled=0
-gpgcheck=0
-```
-
-And install with
-
-```bash
-dnf install SourceXtractorPlusPlus
-```
+RPM packages are temporarily not available due to technical problems.
 
 ## Test Data Set
 

SEBenchmarks/CMakeLists.txt

@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
-
 #===============================================================================
 # Load elements_subdir macro here
 # Examples:
@@ -56,6 +54,8 @@ elements_add_executable(BenchRendering src/program/BenchRendering.cpp
         LINK_LIBRARIES SEFramework SEImplementation ${Boost_LIBRARIES})
 elements_add_executable(BenchBackgroundModel src/program/BenchBackgroundModel.cpp
         LINK_LIBRARIES SEFramework SEImplementation ${Boost_LIBRARIES})
+elements_add_executable(BenchVariablePsfStack src/program/BenchVariablePsfStack.cpp
+        LINK_LIBRARIES SEFramework ${Boost_LIBRARIES})
 
 #===============================================================================
 # Declare the Boost tests here

SEBenchmarks/src/program/BenchVariablePsfStack.cpp

@@ -0,0 +1,136 @@
+/** Copyright © 2019-2025 Université de Genève, LMU Munich - Faculty of Physics, IAP-CNRS/Sorbonne Université
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3.0 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file src/program/BenchVariablePsfStack.cpp
+ * @date 06/27/25
+ * @author marc schefer
+ */
+
+#include <map>
+#include <string>
+#include <random>
+
+#include <boost/program_options.hpp>
+#include <boost/timer/timer.hpp>
+#include "ElementsKernel/ProgramHeaders.h"
+#include "ElementsKernel/Real.h"
+#include "SEFramework/Psf/VariablePsfStack.h"
+
+namespace po = boost::program_options;
+namespace timer = boost::timer;
+using namespace SourceXtractor;
+
+static Elements::Logging logger = Elements::Logging::getLogger("BenchVariablePsfStack");
+
+class BenchVariablePsfStack : public Elements::Program {
+private:
+  std::default_random_engine random_generator;
+  std::uniform_real_distribution<double> random_dist{0.0, 1000.0};
+
+public:
+
+  po::options_description defineSpecificProgramOptions() override {
+    po::options_description options{};
+    options.add_options()
+      ("iterations", po::value<int>()->default_value(100000), "Number of getPsf calls to benchmark")
+      ("measures", po::value<int>()->default_value(3), "Number of timing measurements to take")
+      ("fits-file", po::value<std::string>()->default_value(""), "FITS file containing PSF stack");
+    return options;
+  }
+
+  Elements::ExitCode mainMethod(std::map<std::string, po::variable_value> &args) override {
+
+    auto iterations = args["iterations"].as<int>();
+    auto measures = args["measures"].as<int>();
+    auto fits_file = args["fits-file"].as<std::string>();
+
+    logger.info() << "Benchmarking VariablePsfStack::getPsf() with " << iterations << " iterations";
+    logger.info() << "Taking " << measures << " timing measurements";
+
+    // Initialize VariablePsfStack with FITS file if provided, otherwise nullptr
+    std::shared_ptr<CCfits::FITS> fitsPtr = nullptr;
+    if (!fits_file.empty()) {
+      try {
+        fitsPtr = std::make_shared<CCfits::FITS>(fits_file);
+        logger.info() << "Using FITS file: " << fits_file;
+      } catch (const std::exception& e) {
+        logger.error() << "Failed to load FITS file '" << fits_file << "': " << e.what();
+        return Elements::ExitCode::DATAERR;
+      }
+    } else {
+      logger.error() << "No FITS file provided";
+      return Elements::ExitCode::USAGE;
+    }
+
+    try {
+      VariablePsfStack psfStack(fitsPtr);
+
+      logger.info() << "VariablePsfStack loaded successfully with " << psfStack.getNumberOfPsfs() << " PSFs";
+      logger.info() << "PSF size: " << psfStack.getWidth() << "x" << psfStack.getHeight();
+      logger.info() << "Pixel sampling: " << psfStack.getPixelSampling();
+
+      std::cout << "Iterations,Measurement,Time_nanoseconds" << std::endl;
+
+      for (int m = 0; m < measures; ++m) {
+        logger.info() << "Measurement " << (m + 1) << "/" << measures;
+
+        timer::cpu_timer timer;
+        timer.stop();
+
+        // Prepare test values for getPsf calls
+        std::vector<std::vector<double>> testValues;
+        testValues.reserve(iterations);
+
+        for (int i = 0; i < iterations; ++i) {
+          testValues.push_back({random_dist(random_generator), random_dist(random_generator)});
+        }
+
+        // Start timing
+        timer.start();
+
+        for (int i = 0; i < iterations; ++i) {
+          try {
+            auto psf = psfStack.getPsf(testValues[i]);
+            // Prevent compiler optimization by using the result
+            volatile auto width = psf->getWidth();
+            (void)width; // Suppress unused variable warning
+          } catch (const std::exception& e) {
+            // Expected to fail with nullptr, but we still measure the timing
+            // until the exception is thrown
+          }
+        }
+
+        timer.stop();
+
+        auto elapsed_ns = timer.elapsed().wall;
+        std::cout << iterations << "," << (m + 1) << "," << elapsed_ns << std::endl;
+
+        logger.info() << "Time for " << iterations << " calls: " << (elapsed_ns / 1e9) << " seconds";
+        logger.info() << "Average time per call: " << (elapsed_ns / iterations) << " nanoseconds";
+      }
+
+    } catch (const std::exception& e) {
+      logger.error() << "Error initializing VariablePsfStack: " << e.what();
+      return Elements::ExitCode::DATAERR;
+    }
+
+    return Elements::ExitCode::OK;
+  }
+};
+
+MAIN_FOR(BenchVariablePsfStack)

SEFramework/CMakeLists.txt

@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
-
 #===============================================================================
 # Load elements_subdir macro here
 # Examples:

SEFramework/SEFramework/CoordinateSystem/CoordinateSystem.h

@@ -45,6 +45,30 @@ struct ImageCoordinate {
 
   ImageCoordinate() : m_x(0), m_y(0) {}
   ImageCoordinate(double x, double y) : m_x(x), m_y(y) {}
+
+  ImageCoordinate operator*(double scalar) const {
+    return ImageCoordinate(m_x * scalar, m_y * scalar);
+  }
+
+  ImageCoordinate operator+(const ImageCoordinate& other) const {
+    return ImageCoordinate(m_x + other.m_x, m_y + other.m_y);
+  }
+
+  ImageCoordinate& operator+=(const ImageCoordinate& other) {
+    m_x += other.m_x;
+    m_y += other.m_y;
+    return *this;
+  }
+
+  ImageCoordinate operator-(const ImageCoordinate& other) const {
+    return ImageCoordinate(m_x - other.m_x, m_y - other.m_y);
+  }
+
+  ImageCoordinate& operator-=(const ImageCoordinate& other) {
+    m_x -= other.m_x;
+    m_y -= other.m_y;
+    return *this;
+  }
 };
 
 class CoordinateSystem {

SEFramework/SEFramework/FITS/FitsImageSource.h

@@ -46,6 +46,7 @@ using Euclid::FilePool::FileHandler;
 class FitsImageSource : public ImageSource, public std::enable_shared_from_this<ImageSource> {
 public:
 
+  static std::shared_ptr<FileManager> getFileManager(unsigned int max_open_files = 500);
 
   /**
    * Constructor
@@ -57,14 +58,14 @@ class FitsImageSource : public ImageSource, public std::enable_shared_from_this<
    */
   explicit FitsImageSource(const std::string& filename, int hdu_number = 0,
                   ImageTile::ImageType image_type = ImageTile::AutoType,
-                  std::shared_ptr<FileManager> manager = FileManager::getDefault());
+                  std::shared_ptr<FileManager> manager = getFileManager());
 
   FitsImageSource(const std::string& filename, int width, int height,
                   ImageTile::ImageType image_type,
                   const std::shared_ptr<CoordinateSystem> coord_system = nullptr,
                   bool append = false,
                   bool empty_primary = false,
-                  std::shared_ptr<FileManager> manager = FileManager::getDefault());
+                  std::shared_ptr<FileManager> manager = getFileManager());
 
   virtual ~FitsImageSource() = default;
 
@@ -137,6 +138,8 @@ class FitsImageSource : public ImageSource, public std::enable_shared_from_this<
   ImageTile::ImageType m_image_type;
 
   int m_current_layer;
+
+  static std::shared_ptr<FileManager> s_file_manager;
 };
 
 }

SEFramework/SEFramework/Output/OutputRegistry.h

@@ -169,7 +169,7 @@ class OutputRegistry {
         return converter(source.getProperty<PropertyType>(i));
       };
     }
-    Euclid::Table::Row::cell_type operator()(const SourceInterface& source) {
+    Euclid::Table::Row::cell_type operator()(const SourceInterface& source) const {
       return m_convert_func(source, index);
     }
     std::size_t index = 0;