gammasimtools 0.6.0__tar.gz → 0.6.1__tar.gz

{gammasimtools-0.6.0 → gammasimtools-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gammasimtools
-Version: 0.6.0
+Version: 0.6.1
 Summary: Tools for the Simulation System of the CTA Observatory
 Author-email: simtools developers <simtools-developer@desy.de>
 License: BSD 3-Clause License

{gammasimtools-0.6.0 → gammasimtools-0.6.1}/docker/Dockerfile-prod

@@ -9,7 +9,8 @@ RUN microdnf update -y && microdnf install -y \
     python3.11-devel && \
     microdnf clean all
 
-RUN git clone -b $BUILD_BRANCH https://github.com/gammasim/simtools.git --depth 1
+RUN BUILD_BRANCH=$(echo $BUILD_BRANCH | sed 's#refs/tags/##') && \
+    git clone -b $BUILD_BRANCH https://github.com/gammasim/simtools.git --depth 1
 RUN cd /workdir/ && \
     python3.11 -m venv env && \
     source env/bin/activate && \

{gammasimtools-0.6.0 → gammasimtools-0.6.1}/docker/Dockerfile-simtelarray

@@ -1,4 +1,4 @@
-From almalinux as build_image
+FROM almalinux as build_image
 WORKDIR /workdir
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -26,7 +26,7 @@ RUN rm -f sim_telarray/corsika-run && \
    mv sim_telarray/corsika-77*/run sim_telarray/corsika-run && \
    rm -rf sim_telarray/corsika-77*
 
-From almalinux/9-minimal
+FROM almalinux/9-minimal
 WORKDIR /workdir
 ENV DEBIAN_FRONTEND=noninteractive
 COPY --from=build_image /workdir/sim_telarray/ /workdir/sim_telarray/

{gammasimtools-0.6.0 → gammasimtools-0.6.1}/docs/source/coding_guidelines.rst

@@ -129,7 +129,7 @@ Validating names
 
 Names that are recurrently used along the the package should be validated when given as input.
 Examples of names are: telescope, site, camera, model version. The functionalities to validate names
-are found in  :ref:`utils.names <utilsnames>`. The function validate_name receives the input string
+are found in  :ref:`utils.names <utilsnames>`. The function _validate_name receives the input string
 and a name dictionary,
 that is usually called all_something_names. This dictionary contain the possible names (as keys) and
 lists
@@ -139,7 +139,7 @@ is returned.
 
 The name dictionaries are also defined in util.names. One should also define specific functions
 named
-validate_something_names that call the validate_name with the proper name dictionary. This is only
+validate_something_names that call the _validate_name with the proper name dictionary. This is only
 meant to
 provide a clear interface.
 

{gammasimtools-0.6.0 → gammasimtools-0.6.1}/gammasimtools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gammasimtools
-Version: 0.6.0
+Version: 0.6.1
 Summary: Tools for the Simulation System of the CTA Observatory
 Author-email: simtools developers <simtools-developer@desy.de>
 License: BSD 3-Clause License

{gammasimtools-0.6.0 → gammasimtools-0.6.1}/simtools/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.6.0'
-__version_tuple__ = version_tuple = (0, 6, 0)
+__version__ = version = '0.6.1'
+__version_tuple__ = version_tuple = (0, 6, 1)

{gammasimtools-0.6.0 → gammasimtools-0.6.1}/simtools/db_handler.py

@@ -13,7 +13,6 @@ from pymongo.errors import BulkWriteError
 
 import simtools.utils.general as gen
 from simtools.io_operations import io_handler
-from simtools.model.model_utils import get_telescope_class
 from simtools.utils import names
 
 __all__ = ["DatabaseHandler"]
@@ -287,8 +286,8 @@ class DatabaseHandler:
 
         """
 
-        _tel_class = get_telescope_class(telescope_model_name)
-        _tel_name_converted = names.convert_telescope_model_name_to_yaml(telescope_model_name)
+        _tel_class = names.get_telescope_class(telescope_model_name)
+        _tel_name_converted = names.convert_telescope_model_name_to_yaml_name(telescope_model_name)
 
         if _tel_class == "MST":
             # MST-FlashCam or MST-NectarCam
@@ -346,7 +345,7 @@ class DatabaseHandler:
 
         _site_validated = names.validate_site_name(site)
         _tel_name_db = self._get_telescope_model_name_for_db(_site_validated, telescope_model_name)
-        _tel_class = get_telescope_class(telescope_model_name)
+        _tel_class = names.get_telescope_class(telescope_model_name)
 
         self._logger.debug(f"Tel_name_db: {_tel_name_db}")
         self._logger.debug(f"Tel_class: {_tel_class}")

{gammasimtools-0.6.0 → gammasimtools-0.6.1}/simtools/layout/array_layout.py

@@ -416,12 +416,16 @@ class ArrayLayout:
 
         try:
             return self._corsika_telescope["corsika_sphere_center"][
-                names.get_telescope_type(tel_name)
+                names.get_telescope_class(tel_name)
             ]
         except KeyError:
             self._logger.warning(
                 "Missing definition of CORSIKA sphere center for telescope "
-                f"{tel_name} of type {names.get_telescope_type(tel_name)}"
+                f"{tel_name} of type {names.get_telescope_class(tel_name)}"
+            )
+        except ValueError:
+            self._logger.warning(
+                f"Missing definition of CORSIKA sphere center for telescope {tel_name}"
             )
 
         return 0.0 * u.m
@@ -451,7 +455,11 @@ class ArrayLayout:
         try:
             tel.name = row["telescope_name"]
             if "asset_code" not in row:
-                tel.asset_code = names.get_telescope_type(tel.name)
+                try:
+                    tel.asset_code = names.get_telescope_class(tel.name)
+                # asset code is not a valid telescope name; possibly a calibration device
+                except ValueError:
+                    tel.asset_code = tel.name.split("-")[0]
         except KeyError:
             pass
         try:
@@ -764,7 +772,7 @@ class ArrayLayout:
             pos_x, pos_y, pos_z = tel.get_coordinates("ground")
             try:
                 sphere_radius = self._corsika_telescope["corsika_sphere_radius"][
-                    names.get_telescope_type(tel.name)
+                    names.get_telescope_class(tel.name)
                 ]
             except KeyError:
                 self._logger.error("Missing definition of CORSIKA sphere radius")
@@ -882,7 +890,7 @@ class ArrayLayout:
         telescope_table["radius"] = [
             u.Quantity(
                 telescope_table.meta["corsika_sphere_radius"][
-                    names.get_telescope_type(tel_name_now)
+                    names.get_telescope_class(tel_name_now)
                 ]
             )
             .to("m")

{gammasimtools-0.6.0 → gammasimtools-0.6.1}/simtools/model/array_model.py

@@ -156,7 +156,7 @@ class ArrayModel:
         _all_telescope_model_names = []  # List of telescope names without repetition
         _all_pars_to_change = {}
         for tel in self.layout:
-            tel_size = names.get_telescope_type(tel.name)
+            tel_size = names.get_telescope_class(tel.name)
 
             # Collecting telescope name and pars to change from array_config_data
             tel_model_name, pars_to_change = self._get_single_telescope_info_from_array_config(

{gammasimtools-0.6.0 → gammasimtools-0.6.1}/simtools/model/camera.py

@@ -11,11 +11,8 @@ from scipy.spatial import cKDTree as KDTree
 from scipy.spatial import distance
 
 import simtools.visualization.legend_handlers as leg_h
-from simtools.model.model_utils import (
-    get_camera_name,
-    get_telescope_class,
-    is_two_mirror_telescope,
-)
+from simtools.model.model_utils import is_two_mirror_telescope
+from simtools.utils import names
 from simtools.utils.geometry import rotate
 
 __all__ = ["Camera"]
@@ -51,7 +48,7 @@ class Camera:
         self._logger = logging.getLogger(__name__)
 
         self._telescope_model_name = telescope_model_name
-        self._camera_name = get_camera_name(self._telescope_model_name)
+        _, self._camera_name, _ = names.split_telescope_model_name(telescope_model_name)
         self._camera_config_file = camera_config_file
         self._focal_length = focal_length
         if self._focal_length <= 0:
@@ -743,7 +740,7 @@ class Camera:
 
             if self._pixels["pix_id"][i_pix] < pixels_id_to_print + 1:
                 font_size = 4
-                if get_telescope_class(self._telescope_model_name) == "SCT":
+                if names.get_telescope_class(self._telescope_model_name) == "SCT":
                     font_size = 2
                 plt.text(
                     xy_pix_pos[0],

{gammasimtools-0.6.0 → gammasimtools-0.6.1}/simtools/model/model_utils.py

@@ -1,14 +1,11 @@
 #!/usr/bin/python3
 
-import logging
 import math
 
 from simtools.utils import names
 
 __all__ = [
     "compute_telescope_transmission",
-    "get_telescope_class",
-    "get_camera_name",
     "is_two_mirror_telescope",
     "split_simtel_parameter",
 ]
@@ -62,71 +59,6 @@ def compute_telescope_transmission(pars, off_axis):
     return pars[0] / (1.0 + pars[2] * t ** pars[4])
 
 
-def get_camera_name(telescope_model_name):
-    """
-    Get camera name from the telescope name.
-
-    Parameters
-    ----------
-    telescope_model_name: str
-        Telescope model name (e.g., LST-1).
-
-    Returns
-    -------
-    str
-        Camera name (validated by util.names).
-    """
-
-    _logger = logging.getLogger(__name__)
-    camera_name = ""
-    tel_class, tel_type = names.split_telescope_model_name(telescope_model_name)
-    if tel_class == "LST":
-        camera_name = "LST"
-    elif tel_class == "MST":
-        if "FlashCam" in tel_type:
-            camera_name = "FlashCam"
-        elif "NectarCam" in tel_type:
-            camera_name = "NectarCam"
-        else:
-            _logger.error("Camera not found for MST class telescope")
-    elif tel_class == "SCT":
-        camera_name = "SCT"
-    elif tel_class == "SST":
-        if "ASTRI" in tel_type:
-            camera_name = "ASTRI"
-        elif "GCT" in tel_type:
-            camera_name = "GCT"
-        elif "1M" in tel_type:
-            camera_name = "1M"
-        else:
-            camera_name = "SST"
-    else:
-        _logger.error("Invalid telescope name - please validate it first")
-
-    camera_name = names.validate_camera_name(camera_name)
-    _logger.debug(f"Camera name - {camera_name}")
-    return camera_name
-
-
-def get_telescope_class(telescope_model_name):
-    """
-    Get telescope class from telescope name.
-
-    Parameters
-    ----------
-    telescope_model_name: str
-        Telescope model name (ex. LST-1).
-
-    Returns
-    -------
-    str
-        Telescope class (SST, MST, ...).
-    """
-
-    tel_class, _ = names.split_telescope_model_name(telescope_model_name)
-    return tel_class
-
-
 def is_two_mirror_telescope(telescope_model_name):
     """
     Check if the telescope is a two mirror design.
@@ -141,7 +73,7 @@ def is_two_mirror_telescope(telescope_model_name):
     bool
         True if the telescope is a two mirror one.
     """
-    tel_class, tel_type = names.split_telescope_model_name(telescope_model_name)
+    tel_class, tel_type, _ = names.split_telescope_model_name(telescope_model_name)
     if tel_class == "SST":
         # Only 1M is False
         return "1M" not in tel_type