gammasimtools 0.22.0__py3-none-any.whl → 0.24.0__py3-none-any.whl

simtools/layout/array_layout_utils.py

@@ -280,7 +280,7 @@ def get_array_layouts_from_db(
     if layout_name:
         layout_names = gen.ensure_iterable(layout_name)
     else:
-        site_model = SiteModel(site=site, model_version=model_version, mongo_db_config=db_config)
+        site_model = SiteModel(site=site, model_version=model_version, db_config=db_config)
         layout_names = site_model.get_list_of_array_layouts()
 
     layouts = []
@@ -373,7 +373,7 @@ def _get_array_layout_dict(
 ):
     """Return array layout dictionary for a given telescope list."""
     array_model = ArrayModel(
-        mongo_db_config=db_config,
+        db_config=db_config,
         model_version=model_version,
         site=site,
         array_elements=telescope_list,
@@ -416,7 +416,7 @@ def get_array_elements_from_db_for_layouts(layouts, site, model_version, db_conf
     dict
         Dictionary mapping layout names to telescope IDs.
     """
-    site_model = SiteModel(site=site, model_version=model_version, mongo_db_config=db_config)
+    site_model = SiteModel(site=site, model_version=model_version, db_config=db_config)
     layout_names = site_model.get_list_of_array_layouts() if layouts == ["all"] else layouts
     layout_dict = {}
     for layout_name in layout_names:

simtools/layout/telescope_position.py

@@ -6,8 +6,6 @@ import astropy.units as u
 import numpy as np
 import pyproj
 
-__all__ = ["InvalidCoordSystemErrorError", "TelescopePosition"]
-
 
 class InvalidCoordSystemErrorError(Exception):
     """Exception for invalid coordinate system."""

simtools/model/array_model.py

@@ -7,7 +7,6 @@ import astropy.units as u
 from astropy.table import QTable
 
 from simtools.data_model import data_reader, schema
-from simtools.db import db_handler
 from simtools.io import io_handler
 from simtools.model.calibration_model import CalibrationModel
 from simtools.model.site_model import SiteModel
@@ -15,8 +14,6 @@ from simtools.model.telescope_model import TelescopeModel
 from simtools.simtel.simtel_config_writer import SimtelConfigWriter
 from simtools.utils import general, names
 
-__all__ = ["ArrayModel"]
-
 
 class ArrayModel:
     """
@@ -24,8 +21,8 @@ class ArrayModel:
 
     Parameters
     ----------
-    mongo_db_config: dict
-        MongoDB configuration.
+    db_config: dict
+        Database configuration.
     model_version: str
         Model version.
     label: str, optional
@@ -37,30 +34,33 @@ class ArrayModel:
     array_elements: Union[str, Path, List[str]], optional
         Array element definitions (list of array element or path to file with
         the array element positions).
+    calibration_device_types: List[str], optional
+        List of calibration device types (e.g., 'flat_fielding') attached to each telescope.
     sim_telarray_seeds : dict, optional
         Dictionary with configuration for sim_telarray random instrument setup.
     simtel_path: str, Path, optional
         Path to the sim_telarray installation directory.
-    calibration_device_types: List[str], optional
-        List of calibration device types (e.g., 'flat_fielding') attached to each telescope.
+    overwrite_model_parameters: str, optional
+        File name to overwrite model parameters from DB with provided values.
     """
 
     def __init__(
         self,
-        mongo_db_config,
+        db_config,
         model_version,
         label=None,
         site=None,
         layout_name=None,
         array_elements=None,
+        calibration_device_types=None,
         sim_telarray_seeds=None,
         simtel_path=None,
-        calibration_device_types=None,
+        overwrite_model_parameters=None,
     ):
         """Initialize ArrayModel."""
         self._logger = logging.getLogger(__name__)
         self._logger.debug("Init ArrayModel")
-        self.mongo_db_config = mongo_db_config
+        self.db_config = db_config
         self.model_version = model_version
         self.label = label
         self.layout_name = (
@@ -71,7 +71,8 @@ class ArrayModel:
         self._config_file_path = None
         self._config_file_directory = None
         self.io_handler = io_handler.IOHandler()
-        self.db = db_handler.DatabaseHandler(mongo_db_config=mongo_db_config)
+
+        self.overwrite_model_parameters = overwrite_model_parameters
 
         self.array_elements, self.site_model, self.telescope_models, self.calibration_models = (
             self._initialize(site, array_elements, calibration_device_types)
@@ -107,9 +108,10 @@ class ArrayModel:
         self._logger.debug(f"Getting site parameters from DB ({site})")
         site_model = SiteModel(
             site=names.validate_site_name(site),
-            mongo_db_config=self.mongo_db_config,
+            db_config=self.db_config,
             model_version=self.model_version,
             label=self.label,
+            overwrite_model_parameters=self.overwrite_model_parameters,
         )
 
         # Case 1: array_elements is a file name
@@ -119,7 +121,7 @@ class ArrayModel:
             )
         # Case 2: array elements is a list of elements
         elif isinstance(array_elements_config, list):
-            array_elements = self._get_array_elements_from_list(array_elements_config)
+            array_elements = self._get_array_elements_from_list(array_elements_config, site_model)
         # Case 3: array elements defined in DB by array layout name
         elif self.layout_name is not None:
             array_elements = self._get_array_elements_from_list(
@@ -170,7 +172,7 @@ class ArrayModel:
         return len(self.telescope_models)
 
     @property
-    def site(self) -> str:
+    def site(self):
         """
         Return site.
 
@@ -181,34 +183,6 @@ class ArrayModel:
         """
         return self.site_model.site
 
-    @property
-    def model_version(self):
-        """Model version."""
-        return self._model_version
-
-    @model_version.setter
-    def model_version(self, model_version):
-        """
-        Set model version.
-
-        Parameters
-        ----------
-        _model_version: str or list
-            Model version (e.g., "6.0.0").
-            If a list is passed, it must contain exactly one element,
-            and only that element will be used.
-
-        Raises
-        ------
-        ValueError
-            If more than one model version is passed.
-        """
-        if isinstance(model_version, list):
-            raise ValueError(
-                f"Only one model version can be passed to {self.__class__.__name__}, not a list."
-            )
-        self._model_version = model_version
-
     def _build_telescope_models(self, site_model, array_elements, calibration_device_types):
         """
         Build telescope models for all telescopes of this array.
@@ -245,8 +219,9 @@ class ArrayModel:
                 site=site_model.site,
                 telescope_name=element_name,
                 model_version=self.model_version,
-                mongo_db_config=self.mongo_db_config,
+                db_config=self.db_config,
                 label=self.label,
+                overwrite_model_parameters=self.overwrite_model_parameters,
             )
             calibration_models[element_name] = self._build_calibration_models(
                 telescope_models[element_name],
@@ -276,9 +251,10 @@ class ArrayModel:
             calibration_models[device_name] = CalibrationModel(
                 site=site_model.site,
                 calibration_device_model_name=device_name,
-                mongo_db_config=self.mongo_db_config,
+                db_config=self.db_config,
                 model_version=self.model_version,
                 label=self.label,
+                overwrite_model_parameters=self.overwrite_model_parameters,
             )
         return calibration_models
 
@@ -291,9 +267,7 @@ class ArrayModel:
         """Export sim_telarray configuration files for all telescopes into the model directory."""
         exported_models = []
         for tel_model in self.telescope_models.values():
-            name = tel_model.name + (
-                "_" + tel_model.extra_label if tel_model.extra_label != "" else ""
-            )
+            name = tel_model.name
             if name not in exported_models:
                 self._logger.debug(f"Exporting configuration file for telescope {name}")
                 tel_model.write_sim_telarray_config_file(
@@ -338,7 +312,7 @@ class ArrayModel:
         if not self._array_model_file_exported:
             self.export_sim_telarray_config_file()
 
-    def get_config_directory(self) -> Path:
+    def get_config_directory(self):
         """
         Get the path of the array config directory for sim_telarray.
 
@@ -367,14 +341,12 @@ class ArrayModel:
             self._logger.warning("No model files found to pack.")
             return None
 
-        archive_name = self.get_config_directory() / "model_files.tar.gz"
-        general.pack_tar_file(archive_name, model_files)
+        archive_name = self.get_config_directory() / f"model_files_{self.model_version}.tar.gz"
+        general.pack_tar_file(archive_name, model_files, sub_dir=f"model/{self.model_version}")
         self._logger.info(f"Packed model files into {archive_name}")
         return archive_name
 
-    def _load_array_element_positions_from_file(
-        self, array_elements_file: str | Path, site: str
-    ) -> dict:
+    def _load_array_element_positions_from_file(self, array_elements_file, site):
         """
         Load array element (e.g. telescope) positions from a file into a dict.
 
@@ -402,14 +374,8 @@ class ArrayModel:
         }
 
     def _get_telescope_position_parameter(
-        self,
-        telescope_name: str,
-        site: str,
-        x: u.Quantity,
-        y: u.Quantity,
-        z: u.Quantity,
-        parameter_version: str | None = None,
-    ) -> dict:
+        self, telescope_name, site, x, y, z, parameter_version=None
+    ):
         """
         Return dictionary with telescope position parameters (following DB model database format).
 
@@ -446,7 +412,7 @@ class ArrayModel:
             "model_parameter_schema_version": "0.1.0",
         }
 
-    def _get_array_elements_from_list(self, array_elements_list: list[str]) -> dict:
+    def _get_array_elements_from_list(self, array_elements_list, site_model=None):
         """
         Return dictionary with array elements from a list of telescope names.
 
@@ -458,6 +424,8 @@ class ArrayModel:
         ----------
         array_elements_list: list
             List of telescope names.
+        site_model: SiteModel
+            Site model.
 
         Returns
         -------
@@ -469,31 +437,30 @@ class ArrayModel:
             try:
                 array_elements_dict[names.validate_array_element_name(name)] = None
             except ValueError:
-                array_elements_dict.update(self._get_all_array_elements_of_type(name))
+                array_elements_dict.update(self._get_all_array_elements_of_type(name, site_model))
         return array_elements_dict
 
-    def _get_all_array_elements_of_type(self, array_element_type: str) -> dict:
+    def _get_all_array_elements_of_type(self, array_element_type, site_model):
         """
-        Return all array elements of a specific type using the database.
+        Return all array elements of a specific type.
 
         Parameters
         ----------
         array_element_type : str
             Type of the array element (e.g. LSTN, MSTS)
+        site_model: SiteModel
+            Site model.
 
         Returns
         -------
         dict
             Dict with array elements.
         """
-        all_elements = self.db.get_array_elements_of_type(
-            array_element_type=array_element_type,
-            model_version=self.model_version,
-            collection="telescopes",
+        return self._get_array_elements_from_list(
+            site_model.get_array_elements_of_type(array_element_type)
         )
-        return self._get_array_elements_from_list(all_elements)
 
-    def export_array_elements_as_table(self, coordinate_system: str = "ground") -> QTable:
+    def export_array_elements_as_table(self, coordinate_system="ground"):
         """
         Export array elements positions to astropy table.
 

simtools/model/calibration_model.py

@@ -4,8 +4,6 @@ import logging
 
 from simtools.model.model_parameter import ModelParameter
 
-__all__ = ["CalibrationModel"]
-
 
 class CalibrationModel(ModelParameter):
     """
@@ -19,31 +17,34 @@ class CalibrationModel(ModelParameter):
         Site name (e.g., South or North).
     calibration_device_model_name: str
         Calibration device model name (ex. ILLS-01, ILLN-01, ...).
-    mongo_db_config: dict
-        MongoDB configuration.
+    db_config: dict
+        Database configuration.
     model_version: str
         Model version.
     label: str, optional
         Instance label. Important for output file naming.
+    overwrite_model_parameters: str, optional
+        File name to overwrite model parameters from DB with provided values.
     """
 
     def __init__(
         self,
-        site: str,
-        calibration_device_model_name: str,
-        mongo_db_config: dict,
-        model_version: str,
-        label: str | None = None,
+        site,
+        calibration_device_model_name,
+        db_config,
+        model_version,
+        label=None,
+        overwrite_model_parameters=None,
     ):
         """Initialize CalibrationModel."""
         super().__init__(
             site=site,
             array_element_name=calibration_device_model_name,
             collection="calibration_devices",
-            mongo_db_config=mongo_db_config,
+            db_config=db_config,
             model_version=model_version,
-            db=None,
             label=label,
+            overwrite_model_parameters=overwrite_model_parameters,
         )
 
         self._logger = logging.getLogger(__name__)

simtools/model/camera.py

@@ -8,8 +8,6 @@ import numpy as np
 
 from simtools.utils.geometry import rotate
 
-__all__ = ["Camera"]
-
 
 class Camera:
     """

simtools/model/mirrors.py

@@ -8,8 +8,6 @@ import astropy.units as u
 import numpy as np
 from astropy.table import Table
 
-__all__ = ["InvalidMirrorListFileError", "Mirrors"]
-
 
 class InvalidMirrorListFileError(Exception):
     """Exception for invalid mirror list file."""