gammasimtools 0.26.0__py3-none-any.whl → 0.27.0__py3-none-any.whl

simtools/model/model_utils.py

@@ -3,6 +3,9 @@
 
 import math
 
+from simtools import settings
+from simtools.data_model import schema
+from simtools.io import ascii_handler
 from simtools.model.calibration_model import CalibrationModel
 from simtools.model.site_model import SiteModel
 from simtools.model.telescope_model import TelescopeModel
@@ -10,7 +13,11 @@ from simtools.utils import names
 
 
 def initialize_simulation_models(
-    label, model_version, site, telescope_name, calibration_device_name=None
+    label,
+    model_version,
+    site,
+    telescope_name,
+    calibration_device_name=None,
 ):
     """
     Initialize simulation models for a single telescope, site, and calibration device model.
@@ -33,16 +40,20 @@ def initialize_simulation_models(
     Tuple
         Tuple containing the telescope site, (optional) calibration device model.
     """
+    overwrite_model_parameter_dict = read_overwrite_model_parameter_dict()
+
     tel_model = TelescopeModel(
         site=site,
         telescope_name=telescope_name,
         model_version=model_version,
         label=label,
+        overwrite_model_parameter_dict=overwrite_model_parameter_dict,
     )
     site_model = SiteModel(
         site=site,
         model_version=model_version,
         label=label,
+        overwrite_model_parameter_dict=overwrite_model_parameter_dict,
     )
     if calibration_device_name is not None:
         calibration_model = CalibrationModel(
@@ -50,6 +61,7 @@ def initialize_simulation_models(
             calibration_device_model_name=calibration_device_name,
             model_version=model_version,
             label=label,
+            overwrite_model_parameter_dict=overwrite_model_parameter_dict,
         )
     else:
         calibration_model = None
@@ -58,6 +70,33 @@ def initialize_simulation_models(
     return tel_model, site_model, calibration_model
 
 
+def read_overwrite_model_parameter_dict(overwrite_model_parameters=None):
+    """
+    Read overwrite model parameters dictionary from file.
+
+    Parameters
+    ----------
+    overwrite_model_parameters: str, optional
+        File name with overwrite model parameters.
+
+    Returns
+    -------
+    dict
+        Dictionary with model parameters to overwrite.
+    """
+    overwrite_model_parameter_dict = {}
+    overwrite_model_parameters = overwrite_model_parameters or settings.config.args.get(
+        "overwrite_model_parameters"
+    )
+    if overwrite_model_parameters is not None:
+        overwrite_model_parameter_dict = schema.validate_dict_using_schema(
+            data=ascii_handler.collect_data_from_file(file_name=overwrite_model_parameters),
+            schema_file="simulation_models_info.schema.yml",
+        ).get("changes", {})
+
+    return overwrite_model_parameter_dict
+
+
 def compute_telescope_transmission(pars: list[float], off_axis: float) -> float:
     """
     Compute telescope transmission (0 < T < 1) for a given off-axis angle.

simtools/model/site_model.py

@@ -30,8 +30,8 @@ class SiteModel(ModelParameter):
         Model version or list of model versions (in which case only the first one is used).
     label: str, optional
         Instance label.
-    overwrite_model_parameters: str, optional
-        File name to overwrite model parameters from DB with provided values.
+    overwrite_model_parameter_dict: dict, optional
+        Dictionary to overwrite model parameters from DB with provided values.
     ignore_software_version: bool, optional
         If True, ignore software version checks for deprecated parameters.
     """
@@ -41,7 +41,7 @@ class SiteModel(ModelParameter):
         site,
         model_version,
         label=None,
-        overwrite_model_parameters=None,
+        overwrite_model_parameter_dict=None,
         ignore_software_version=False,
     ):
         """Initialize SiteModel."""
@@ -52,7 +52,7 @@ class SiteModel(ModelParameter):
             model_version=model_version,
             label=label,
             collection="sites",
-            overwrite_model_parameters=overwrite_model_parameters,
+            overwrite_model_parameter_dict=overwrite_model_parameter_dict,
             ignore_software_version=ignore_software_version,
         )
 

simtools/model/telescope_model.py

@@ -30,8 +30,8 @@ class TelescopeModel(ModelParameter):
         Model version.
     label: str, optional
         Instance label.
-    overwrite_model_parameters: str, optional
-        File name to overwrite model parameters from DB with provided values.
+    overwrite_model_parameter_dict: dict, optional
+        Dictionary to overwrite model parameters from DB with provided values.
     ignore_software_version: bool, optional
         If True, ignore software version checks for deprecated parameters.
     """
@@ -42,7 +42,7 @@ class TelescopeModel(ModelParameter):
         telescope_name,
         model_version,
         label=None,
-        overwrite_model_parameters=None,
+        overwrite_model_parameter_dict=None,
         ignore_software_version=False,
     ):
         """Initialize TelescopeModel."""
@@ -51,12 +51,11 @@ class TelescopeModel(ModelParameter):
             array_element_name=telescope_name,
             model_version=model_version,
             label=label,
-            overwrite_model_parameters=overwrite_model_parameters,
+            overwrite_model_parameter_dict=overwrite_model_parameter_dict,
             ignore_software_version=ignore_software_version,
         )
 
         self._logger = logging.getLogger(__name__)
-        self._logger.debug("Init TelescopeModel %s %s", site, telescope_name)
 
         self._single_mirror_list_file_paths = None
         self._mirrors = None

simtools/ray_tracing/incident_angles.py

@@ -9,14 +9,16 @@ Angle of incidence on to secondary mirror [deg] (if available).
 import logging
 import math
 import re
-import subprocess
 from pathlib import Path
 
 import astropy.units as u
-from astropy.table import QTable
+import numpy as np
+from astropy.table import QTable, vstack
 
 from simtools import settings
 from simtools.data_model.metadata_collector import MetadataCollector
+from simtools.data_model.model_data_writer import ModelDataWriter
+from simtools.job_execution import job_manager
 from simtools.model.model_utils import initialize_simulation_models
 
 
@@ -273,8 +275,8 @@ class IncidentAnglesCalculator:
         """
         self.logger.info("Executing %s (logging to %s)", script_path, log_file)
         try:
-            subprocess.check_call([str(script_path)])
-        except subprocess.CalledProcessError as exc:
+            job_manager.submit(script_path)
+        except job_manager.JobExecutionError as exc:
             raise RuntimeError(f"Incident angles run failed, see log: {log_file}") from exc
 
     def _compute_incidence_angles_from_imaging_list(self, photons_file):
@@ -283,7 +285,7 @@ class IncidentAnglesCalculator:
         Column positions may differ between telescope types and sim_telarray versions.
         Header lines (``# Column N: ...``) are parsed to find indices; otherwise
         legacy positions (1-based) are used: focal=26, primary=32, secondary=36,
-        primary X/Y = 29/30, secondary X/Y = 33/34.
+        primary X/Y = 29/30, secondary X/Y=33/34.
 
         Parameters
         ----------
@@ -692,9 +694,88 @@ class IncidentAnglesCalculator:
             self.logger.warning("No results to save")
             return
         output_file = self.results_dir / f"incident_angles_{self._label_suffix()}.ecsv"
-        self.results.write(output_file, format="ascii.ecsv", overwrite=True)
+
+        data = self.results["angle_incidence_focal"].to(u.deg).value
+        bin_centers, hist = self._calculate_histogram(data, bins=1000)
+
+        output_table = QTable()
+        output_table["Incidence angle"] = bin_centers * u.deg
+        output_table["Fraction"] = hist
+
+        output_table.write(output_file, format="ascii.ecsv", overwrite=True)
 
         MetadataCollector.dump(
             args_dict=self.config_data,
             output_file=output_file.with_suffix(".yml"),
         )
+
+    def save_model_parameters(self, results_by_offset):
+        """
+        Write model parameters dictionary (json) + astropy table with incident angles.
+
+        Parameters
+        ----------
+        results_by_offset : dict
+            Dictionary with results for each offset.
+        """
+        # Combine results from all offsets
+        tables = [res for res in results_by_offset.values() if res is not None and len(res) > 0]
+        if not tables:
+            self.logger.warning("No results to write model parameters.")
+            return
+
+        combined_table = vstack(tables)
+
+        parameter_mapping = {
+            "camera_filter_incidence_angle": "angle_incidence_focal",
+            "primary_mirror_incidence_angle": "angle_incidence_primary",
+            "secondary_mirror_incidence_angle": "angle_incidence_secondary",
+        }
+
+        for param_name, col_name in parameter_mapping.items():
+            if col_name not in combined_table.colnames:
+                continue
+
+            data = combined_table[col_name].to(u.deg).value
+            # Create histogram
+            bin_centers, hist = self._calculate_histogram(data, bins=100)
+
+            table = QTable()
+            table["Incidence angle"] = bin_centers * u.deg
+            table["Fraction"] = hist
+
+            writer = ModelDataWriter(output_file=self.output_dir / f"{param_name}.ecsv")
+            writer.write(
+                product_data=table,
+                metadata=MetadataCollector(args_dict=self.config_data),
+            )
+
+            ModelDataWriter.dump_model_parameter(
+                parameter_name=param_name,
+                value=f"{param_name}.ecsv",
+                instrument=self.config_data["telescope"],
+                parameter_version=self.config_data["model_version"],
+                output_file=f"{param_name}.json",
+                output_path=self.output_dir,
+                metadata_input_dict=self.config_data,
+            )
+
+    def _calculate_histogram(self, data, bins=100):
+        """
+        Calculate normalized histogram (density).
+
+        Parameters
+        ----------
+        data : numpy.ndarray
+            Data to calculate histogram for.
+        bins : int
+            Number of bins.
+
+        Returns
+        -------
+        tuple
+            Bin centers and histogram values (density).
+        """
+        hist, bin_edges = np.histogram(data, bins=bins, density=True)
+        bin_centers = (bin_edges[:-1] + bin_edges[1:]) / 2
+        return bin_centers, hist