gammasimtools 0.8.2__py3-none-any.whl → 0.9.0__py3-none-any.whl

simtools/visualization/visualize.py

@@ -5,6 +5,7 @@ import copy
 import logging
 import re
 from collections import OrderedDict
+from pathlib import Path
 
 import astropy.units as u
 import matplotlib.patches as mpatches
@@ -27,6 +28,7 @@ __all__ = [
     "plot_array",
     "plot_hist_2d",
     "plot_table",
+    "save_figure",
     "set_style",
 ]
 
@@ -366,6 +368,12 @@ def handle_kwargs(kwargs):
         "empty_markers": False,
         "plot_ratio": False,
         "plot_difference": False,
+        "xscale": "linear",
+        "yscale": "linear",
+        "xlim": (None, None),
+        "ylim": (None, None),
+        "xtitle": None,
+        "ytitle": None,
     }
     for key, default in kwargs_defaults.items():
         kwargs[key] = kwargs.pop(key, default)
@@ -414,11 +422,17 @@ def plot_main_data(data_dict, kwargs, plot_args):
     """Plot the main data."""
     for label, data_now in data_dict.items():
         assert len(data_now.dtype.names) == 2, "Input array must have two columns with titles."
-        x_title, y_title = data_now.dtype.names[0], data_now.dtype.names[1]
-        x_title_unit = _add_unit(x_title, data_now[x_title])
-        y_title_unit = _add_unit(y_title, data_now[y_title])
-        plt.plot(data_now[x_title], data_now[y_title], label=label, **plot_args)
-
+        x_column_name, y_column_name = data_now.dtype.names[0], data_now.dtype.names[1]
+        x_title = kwargs["xtitle"] if kwargs.get("xtitle") else x_column_name
+        y_title = kwargs["ytitle"] if kwargs.get("ytitle") else y_column_name
+        x_title_unit = _add_unit(x_title, data_now[x_column_name])
+        y_title_unit = _add_unit(y_title, data_now[y_column_name])
+        plt.plot(data_now[x_column_name], data_now[y_column_name], label=label, **plot_args)
+
+    plt.xscale(kwargs["xscale"])
+    plt.yscale(kwargs["yscale"])
+    plt.xlim(kwargs["xlim"])
+    plt.ylim(kwargs["ylim"])
     plt.ylabel(y_title_unit)
     if not (kwargs["plot_ratio"] or kwargs["plot_difference"]):
         plt.xlabel(x_title_unit)
@@ -878,3 +892,27 @@ def plot_simtel_ctapipe(filename, cleaning_args, distance, return_cleaned=False)
     ax.set_axis_off()
     fig.tight_layout()
     return fig
+
+
+def save_figure(fig, output_file, figure_format=None, log_title=""):
+    """
+    Save figure to output file(s).
+
+    Parameters
+    ----------
+    fig: plt.figure
+        Figure to save.
+    output_file: Path, str
+        Path to save the figure (without suffix).
+    figure_format: list
+        List of formats to save the figure.
+    title: str
+        Title of the figure to be added to the log message.
+    """
+    figure_format = figure_format or ["pdf", "png"]
+    for fmt in figure_format:
+        _file = Path(output_file).with_suffix(f".{fmt}")
+        fig.savefig(_file, format=fmt, bbox_inches="tight")
+        logging.info(f"Saved plot {log_title} to {_file}")
+
+    fig.clf()

simtools/db/db_from_repo_handler.py

@@ -1,106 +0,0 @@
-"""
-Module to mimic DB interaction for simulation model DB development.
-
-Read simulation model values from files in simulation model repository.
-
-"""
-
-import logging
-
-import simtools.utils.general as gen
-from simtools.utils import names
-
-logger = logging.getLogger(__name__)
-
-
-def update_model_parameters_from_repo(
-    parameters,
-    site,
-    array_element_name,
-    parameter_collection,
-    model_version,
-    db_simulation_model_url,
-):
-    """
-    Update model parameters with values from a repository.
-
-    Existing entries will be updated, new entries will be added.
-
-    Parameters
-    ----------
-    parameters: dict
-        Existing dictionary with parameters to be updated.
-    site: str
-        Observatory site (e.g., South or North)
-    array_element_name: str
-        Array element name (e.g., MSTN-01, MSTN-design)
-    parameter_collection: str
-        Collection of parameters to be queried (e.g., telescope or site)
-    model_version: str
-        Model version to use.
-    db_simulation_model_url: str
-        URL to the simulation model repository.
-
-    Returns
-    -------
-    dict
-        Updated dictionary with parameters.
-
-    """
-    logger.info(
-        "Updating model parameters from repository for site: %s, array element: %s",
-        site,
-        array_element_name,
-    )
-
-    if db_simulation_model_url is None:
-        logger.debug(f"No repository specified, skipping {parameter_collection} parameter updates")
-        return parameters
-
-    if parameter_collection in ["telescopes", "calibration"]:
-        _file_path = gen.join_url_or_path(
-            db_simulation_model_url,
-            "model_versions",
-            model_version,
-            array_element_name,
-        )
-        # use design array element model in case there is no model defined for this array element ID
-        _design_model = names.get_array_element_type_from_name(array_element_name) + "-design"
-        if _design_model == array_element_name:
-            _design_model = None
-    elif parameter_collection == "site":
-        _file_path = gen.join_url_or_path(
-            db_simulation_model_url,
-            "model_versions",
-            model_version,
-            "OBS-" + site,
-        )
-        _design_model = None
-    else:
-        raise ValueError(f"Unknown parameter collection {parameter_collection}")
-
-    for key in parameters:
-        _tmp_par = {}
-        _parameter_file = gen.join_url_or_path(_file_path, f"{key}.json")
-        try:
-            _tmp_par = gen.collect_data_from_file(file_name=_parameter_file)
-        except (FileNotFoundError, gen.InvalidConfigDataError):
-            # use design array element model in case there is no model defined for this
-            #  array element ID. Accept errors, as not all parameters are defined in the repository
-            try:
-                _file_path = gen.join_url_or_path(
-                    db_simulation_model_url,
-                    "model_versions",
-                    model_version,
-                    _design_model,
-                )
-                _tmp_par = gen.collect_data_from_file(
-                    file_name=gen.join_url_or_path(_file_path, f"{key}.json")
-                )
-            except (FileNotFoundError, TypeError, gen.InvalidConfigDataError):
-                pass
-        if _tmp_par.get("version") == model_version:
-            parameters[key] = _tmp_par
-
-    # return all entries which are not None
-    return {key: value for key, value in parameters.items() if value is not None}