gammasimtools 0.6.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

{gammasimtools-0.6.0.dist-info → gammasimtools-0.6.1.dist-info}/METADATA

@@ -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.dist-info → gammasimtools-0.6.1.dist-info}/RECORD

@@ -1,8 +1,8 @@
 simtools/__init__.py,sha256=yvx0i5ygbllmMtF2Tzy7pohvhQNH_dBdj0Bt8bKFYpc,231
-simtools/_version.py,sha256=2JKwcA-YQ0okV2N-gwTWy_n51igWrPcsKQFm0cnqsvw,411
+simtools/_version.py,sha256=lgiCYGSijhLK71WmuudWf_AyhNAutwQWx2V8bV6a5VQ,411
 simtools/camera_efficiency.py,sha256=Bx9pCmx1egKzV3gtZKK4F3dea9ShauxqI17XTtCVAaQ,18817
 simtools/constants.py,sha256=QJr7NvjmyXd-xHd1xP_KuJxRFTeysxRLBYbC5tctE6Y,326
-simtools/db_handler.py,sha256=Cks1OIOziZIUh-Bxbmq8nMX99N9CvVN21PKv15iB318,47954
+simtools/db_handler.py,sha256=5MEAK_E__NLHmYn5oJPsgO0D3ZTwWvB2yIKxN9w8hxU,47912
 simtools/psf_analysis.py,sha256=YnQJh_Xckp_TH5lMLB4EsmoUVIWECshFijYz5-zsBjM,14741
 simtools/ray_tracing.py,sha256=_MYHzYW4l3dAgUu_X5eKirnX8VYFU81_VwRvtimL8zI,18278
 simtools/simulator.py,sha256=Cor46oIrpPJebQOMYQkUwIUNyyu3m-4HUh_d5Y40e1k,25974
@@ -57,14 +57,14 @@ simtools/io_operations/io_handler.py,sha256=ZYVAtG7CMOXwMFv4gKSOg3dYdsP-DkvMMaZO
 simtools/job_execution/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simtools/job_execution/job_manager.py,sha256=oo0Ijj232w0dz7rqkTwsgg3jQhVEelug9aMYBfqBu4I,6050
 simtools/layout/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simtools/layout/array_layout.py,sha256=_qUjyxQ4FX6IzE14c4RiJ9MCkhkizJE0kuOxbSCchyE,30619
+simtools/layout/array_layout.py,sha256=hpYFSdIIaO922V4X1JWvgnREqmTZ3r971fUWZCV5xlw,30997
 simtools/layout/geo_coordinates.py,sha256=Ect3lioZyMFUfHYeWF9WDMZiVq7YwMaX1f7aHQYmDDQ,5929
 simtools/layout/telescope_position.py,sha256=fiy9X_c0a9VitFGqXYa2hNQvYQvU_Ohq3M82Jnmscjc,17375
 simtools/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simtools/model/array_model.py,sha256=t_-vn1m-0ddnUnqBFRApDAvXtdtnMMRiCB9QoiU5c88,14248
-simtools/model/camera.py,sha256=FnKjw5Df88MsAgJieQoQMrw2Mf5XjYdYxhOlBut1gtE,30776
+simtools/model/array_model.py,sha256=cqpHFmMpY_H7DkW5Y-Z52gWD45lWSfV8qYnfSSOz818,14249
+simtools/model/camera.py,sha256=UpFG6AOzocwjN5fpoVvEXSDiGuri_gQP1OKs_amZ_4o,30777
 simtools/model/mirrors.py,sha256=kHQXCoFfdSykXN1rwnPZorJDqAxU0KJ1gJ8hyQRspEA,8060
-simtools/model/model_utils.py,sha256=YrKl96I3pb3WzNkQLlejHMq5w-XwFMvfu5xlsED12P0,3748
+simtools/model/model_utils.py,sha256=3FT5hd8aCnLCmd0FlbOmCjLLa-0sCusclkdgU3w8hGc,2010
 simtools/model/telescope_model.py,sha256=2Ae9ShuNUycNlTBdKszBRQmuiKIG3gKqCZbotaYSz-U,29313
 simtools/schemas/data.metaschema.yml,sha256=sTq7g1oNG9ZZs6vaasWHPVDMFkXexepRukiKfh5Cwe8,10053
 simtools/schemas/metadata.metaschema.yml,sha256=MrGxTkKAaJNqA5WAPLH20ACHvVVuqOrgukJX-kB0tXs,16494
@@ -79,13 +79,13 @@ simtools/simtel/simtel_runner_ray_tracing.py,sha256=q1hoMOBmGikCDjHirNIPL_mkRlF_
 simtools/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simtools/utils/general.py,sha256=zlYBVkZ5McTbPHe-eLYaM_rgmFV0fl1u_TEY8OHAKss,26011
 simtools/utils/geometry.py,sha256=bj7ehKy89HuG0hk0Bc5JkJv_hpDFkfsSx_gV9D5pZjM,6300
-simtools/utils/names.py,sha256=rBQ3gTB4yuF6j3okEtvzWonJhKXqXiBC6Qz7d_aSgcU,19843
+simtools/utils/names.py,sha256=sc1DZ9FrAoyfhSgeg4cxrFHfF198KeKG-o7KI5WQH8A,23574
 simtools/visualization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simtools/visualization/legend_handlers.py,sha256=2Ja0QE7nTDPhvgFjp1yvI_CC3P7peiJzMuqd1I-cFDU,12643
-simtools/visualization/visualize.py,sha256=70H1lYtsUNXDYUzUVNRuG-gcdfUO2feplJ0aJhnuQ7I,21813
-gammasimtools-0.6.0.dist-info/LICENSE,sha256=idBrtxX6eQcUlG0YBTx-O2RNKNKg1Gidb8OQf9q0X7s,1543
-gammasimtools-0.6.0.dist-info/METADATA,sha256=OtOvzOR4FQt8iHWxHX33b_xIcXOGaSMBpEEYAcZ62I8,7888
-gammasimtools-0.6.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-gammasimtools-0.6.0.dist-info/entry_points.txt,sha256=2Ph74hJHTVd6n_mDhOfzJzMRnoS_8OO1DvKDyhkhIi0,1770
-gammasimtools-0.6.0.dist-info/top_level.txt,sha256=9Yi7Q7aQX6alvpP2YGQtIYo208wdGkXUApHboEdj-ys,9
-gammasimtools-0.6.0.dist-info/RECORD,,
+simtools/visualization/visualize.py,sha256=GP6djbTXzAePRszBD8XE9omg8ARNQXlvV-RSJBLMNiI,21815
+gammasimtools-0.6.1.dist-info/LICENSE,sha256=idBrtxX6eQcUlG0YBTx-O2RNKNKg1Gidb8OQf9q0X7s,1543
+gammasimtools-0.6.1.dist-info/METADATA,sha256=ODS_qH_gu9WVV_muqnRfGpgmKh81dsG8yJVk-gqIYP0,7888
+gammasimtools-0.6.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+gammasimtools-0.6.1.dist-info/entry_points.txt,sha256=2Ph74hJHTVd6n_mDhOfzJzMRnoS_8OO1DvKDyhkhIi0,1770
+gammasimtools-0.6.1.dist-info/top_level.txt,sha256=9Yi7Q7aQX6alvpP2YGQtIYo208wdGkXUApHboEdj-ys,9
+gammasimtools-0.6.1.dist-info/RECORD,,

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)

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}")

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")

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(

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],

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

simtools/utils/names.py

@@ -4,26 +4,27 @@ import re
 _logger = logging.getLogger(__name__)
 
 __all__ = [
+    "array_element_id_from_telescope_model_name",
     "camera_efficiency_log_file_name",
     "camera_efficiency_results_file_name",
     "camera_efficiency_simtel_file_name",
-    "convert_telescope_model_name_to_yaml",
+    "convert_telescope_model_name_to_yaml_name",
     "get_site_from_telescope_name",
-    "get_telescope_type",
-    "is_valid_name",
+    "get_telescope_class",
     "layout_telescope_list_file_name",
     "ray_tracing_file_name",
     "ray_tracing_plot_file_name",
     "ray_tracing_results_file_name",
+    "sanitize_name",
     "simtel_array_config_file_name",
+    "simtel_single_mirror_list_file_name",
     "simtel_telescope_config_file_name",
-    "simtools_instrument_name",
+    "get_telescope_name_db",
     "split_telescope_model_name",
-    "validate_camera_name",
+    "telescope_model_name_from_array_element_id",
+    "translate_simtools_to_corsika",
     "validate_array_layout_name",
     "validate_model_version_name",
-    "validate_name",
-    "validate_simtel_mode_name",
     "validate_site_name",
     "validate_sub_system_name",
     "validate_telescope_id_name",
@@ -49,20 +50,26 @@ all_telescope_class_names = {
     veritas: ["veritas"],
 }
 
-all_camera_names = {
-    "SST": ["sst"],
+all_subsystem_names = {
+    "SST": ["sst", "ssts", "SSTS"],
     "ASTRI": ["astri"],
     "GCT": ["gct", "gct-s"],
     "1M": ["1m"],
-    "FlashCam": ["flashcam", "flash-cam"],
-    "NectarCam": ["nectarcam", "nectar-cam"],
-    "SCT": ["sct"],
-    "LST": ["lst"],
+    "FlashCam": ["flashcam", "flash-cam", "msts", "MSTS"],
+    "NectarCam": ["nectarcam", "nectar-cam", "mstn", "MSTN"],
+    "SCT": ["sct", "scts", "SCTS"],
+    "LST": ["lst", "lsts", "LSTS", "lstn", "LSTN"],
+    "Camera": ["Camera", "camera"],
+    "Structure": ["Structure", "structure"],
+    "MAGIC": ["magic", "MAGIC"],
+    "VERITAS": ["veritas", "VERITAS"],
+    "HESS": ["hess", "HESS"],
 }
 
-all_structure_names = {"Structure": ["Structure", "structure"]}
-
-all_site_names = {"South": ["paranal", "south"], "North": ["lapalma", "north"]}
+all_site_names = {
+    "South": ["paranal", "south", "cta-south", "ctao-south", "s"],
+    "North": ["lapalma", "north", "cta-north", "ctao-north", "n"],
+}
 
 all_model_version_names = {
     "2015-07-21": [""],
@@ -87,16 +94,6 @@ all_model_version_names = {
     "Latest": [],
 }
 
-all_simtel_mode_names = {
-    "RayTracing": ["raytracing", "ray-tracing"],
-    "RayTracingSingleMirror": [
-        "raytracing-singlemirror",
-        "ray-tracing-singlemirror",
-        "ray-tracing-single-mirror",
-    ],
-    "Trigger": ["trigger"],
-}
-
 all_array_layout_names = {
     "4LST": ["4-lst", "4lst"],
     "1LST": ["1-lst", "1lst"],
@@ -108,8 +105,16 @@ all_array_layout_names = {
     "TestLayout": ["test-layout"],
 }
 
-corsika_to_simtools_names = {
-    "OBSLEV": "corsika_obs_level",
+# array elements as defined by CTAO
+# (includes for now only telescopes;
+# can be extended to other elements)
+all_array_element_id_names = {
+    "lstn": ["LSTN", "lstn"],
+    "mstn": ["MSTN", "mstn"],
+    "lsts": ["LSTS", "lsts"],
+    "msts": ["MSTS", "msts"],
+    "ssts": ["SSTS", "ssts"],
+    "scts": ["SCTS", "scts"],
 }
 
 
@@ -127,24 +132,24 @@ def validate_sub_system_name(name):
     str
         Validated name.
     """
-    return validate_name(name, {**all_camera_names, **all_structure_names})
+    return _validate_name(name, all_subsystem_names)
 
 
-def validate_camera_name(name):
+def validate_telescope_class_name(name):
     """
-    Validate a camera name.
+    Validate a telescope class name (LST, MST, SST, ...).
 
     Parameters
     ----------
     name: str
-        Camera name
+        Telescope class name.
 
     Returns
     -------
     str
         Validated name.
     """
-    return validate_name(name, all_camera_names)
+    return _validate_name(name, all_telescope_class_names)
 
 
 def validate_telescope_id_name(name):
@@ -153,11 +158,11 @@ def validate_telescope_id_name(name):
 
     Valid names e.g.,
     - D
-    - telescope ID
+    - telescope ID (e.g., 1, 5, 15)
 
     Parameters
     ----------
-    name: str
+    name: str or int
         Telescope ID name.
 
     Returns
@@ -171,8 +176,8 @@ def validate_telescope_id_name(name):
         If name is not valid.
     """
 
-    if name == "D" or name.isdigit():
-        return name
+    if isinstance(name, int) or name.upper() in ("D", "D234", "TEST") or name.isdigit():
+        return str(name).upper()
 
     msg = f"Invalid telescope ID name {name}"
     _logger.error(msg)
@@ -193,24 +198,7 @@ def validate_model_version_name(name):
     str
         Validated name.
     """
-    return validate_name(name, all_model_version_names)
-
-
-def validate_simtel_mode_name(name):
-    """
-    Validate a sim_telarray mode name.
-
-    Parameters
-    ----------
-    name: str
-        sim_telarray mode name.
-
-    Returns
-    -------
-    str
-        Validated name.
-    """
-    return validate_name(name, all_simtel_mode_names)
+    return _validate_name(name, all_model_version_names)
 
 
 def validate_site_name(name):
@@ -227,7 +215,7 @@ def validate_site_name(name):
     str
         Validated name.
     """
-    return validate_name(name, all_site_names)
+    return _validate_name(name, all_site_names)
 
 
 def validate_array_layout_name(name):
@@ -244,10 +232,10 @@ def validate_array_layout_name(name):
     str
         Validated name.
     """
-    return validate_name(name, all_array_layout_names)
+    return _validate_name(name, all_array_layout_names)
 
 
-def validate_name(name, all_names):
+def _validate_name(name, all_names):
     """
     Validate a name given the all_names options. For each key in all_names, a list of options is \
     given. If name is in this list, the key name is returned.
@@ -269,7 +257,7 @@ def validate_name(name, all_names):
         If name is not valid.
     """
 
-    if not is_valid_name(name, all_names):
+    if not _is_valid_name(name, all_names):
         msg = f"Invalid name {name}"
         raise ValueError(msg)
     for main_name, list_of_names in all_names.items():
@@ -280,7 +268,7 @@ def validate_name(name, all_names):
     return None
 
 
-def is_valid_name(name, all_names):
+def _is_valid_name(name, all_names):
     """
     Check if name is valid.
 
@@ -320,27 +308,27 @@ def validate_telescope_model_name(name):
         Validated name.
     """
 
-    tel_class, tel_type = split_telescope_model_name(name)
-    tel_class = validate_name(tel_class, all_telescope_class_names)
-    if "flashcam" in tel_type:
-        tel_type = tel_type.replace("flashcam", "FlashCam")
-    if "nectarcam" in tel_type:
-        tel_type = tel_type.replace("nectarcam", "NectarCam")
-    if "1m" in tel_type:
-        tel_type = tel_type.replace("1m", "1M")
-    if "gct" in tel_type:
-        tel_type = tel_type.replace("gct", "GCT")
-    if "astri" in tel_type:
-        tel_type = tel_type.replace("astri", "ASTRI")
-    if "-d" in "-" + tel_type:
-        tel_type = tel_type.replace("d", "D")
+    # e.g, MSTN or MSTN-01
+    try:
+        return _validate_name(name, all_array_element_id_names)
+    except ValueError:
+        pass
 
-    return tel_class + "-" + tel_type
+    # e.g., MST-FlashCam or MST-FlashCam-01
+    tel_class, tel_type, tel_id = split_telescope_model_name(name)
+    _telescope_name = tel_class
+    if tel_class != tel_type and len(tel_type) > 0:
+        _telescope_name += "-" + tel_type
+    if len(tel_id) > 0:
+        _telescope_name += "-" + tel_id
+    return _telescope_name
 
 
 def split_telescope_model_name(name):
     """
-    Split a telescope name into class and type.
+    Split a telescope name into class, type, telescope id.
+    Allow various inputs, e.g., MST-FlashCam-01, MST-FlashCam,
+    MSTN-01, MSTN, MST-1
 
     Parameters
     ----------
@@ -349,14 +337,44 @@ def split_telescope_model_name(name):
 
     Returns
     -------
-    str, str
-       class (LST, MST, SST ...) and type (any complement).
+    str, str, str
+       class (LST, MST, SST ...), type (any complement), telescope id
     """
-
     name_parts = name.split("-")
+    # e.g., MSTN or MSTN-01
+    try:
+        _is_valid_name(name_parts[0], all_array_element_id_names)
+        return (
+            validate_telescope_class_name(name_parts[0][0:3]),
+            validate_sub_system_name(name_parts[0]),
+            validate_telescope_id_name(name_parts[1]) if len(name_parts) > 1 else "",
+        )
+    except ValueError:
+        pass
+
+    # e.g., MST-FlashCam or MST-FlashCam-01, MST-1
+    # (note that this complicated, as LST-1 is a valid
+    # name without explicit subsystem given in name)
     tel_class = name_parts[0]
-    tel_type = "-".join(name_parts[1:])
-    return tel_class, tel_type
+    try:
+        tel_id = validate_telescope_id_name(name_parts[-1])
+        _tmp_tel_type = name_parts[1:-1]
+    except ValueError:
+        tel_id = ""
+        _tmp_tel_type = name_parts[1:]
+    if len(_tmp_tel_type) > 0:
+        tel_type = "-".join(_tmp_tel_type)
+    else:
+        try:
+            tel_type = validate_sub_system_name(tel_class)
+        except ValueError:
+            tel_type = ""
+
+    return (
+        validate_telescope_class_name(tel_class),
+        validate_sub_system_name(tel_type) if len(tel_type) > 0 else "",
+        validate_telescope_id_name(tel_id) if len(tel_id) > 0 else "",
+    )
 
 
 def get_site_from_telescope_name(name):
@@ -373,12 +391,20 @@ def get_site_from_telescope_name(name):
     str
         Site name (South or North).
     """
+    # e.g, MSTN or MSTN-01 (tested by get_telescope_class)
+    try:
+        get_telescope_class(name)
+        return validate_site_name(name[3])
+    except ValueError:
+        pass
+    # e.g., South-MST-FlashCam
     return validate_site_name(name.split("-")[0])
 
 
 def validate_telescope_name_db(name):
     """
     Validate a telescope DB name.
+    Examples are North-LST-1, North-MST-NectarCam-D, or South-SST-Structure-D.
 
     Parameters
     ----------
@@ -395,7 +421,7 @@ def validate_telescope_name_db(name):
     return f"{validate_site_name(site)}-{validate_telescope_model_name(tel_model_name)}"
 
 
-def convert_telescope_model_name_to_yaml(name):
+def convert_telescope_model_name_to_yaml_name(name):
     """
     Get telescope name following the old convention (yaml files) from the current telescope name.
 
@@ -414,8 +440,9 @@ def convert_telescope_model_name_to_yaml(name):
     ValueError
         if name is not valid.
     """
-    tel_class, tel_type = split_telescope_model_name(name)
-    new_name = tel_class + "-" + tel_type
+    tel_class, tel_type, tel_id = split_telescope_model_name(name)
+    new_name = tel_class if tel_class == tel_type else tel_class + "-" + tel_type
+    new_name = new_name + "-" + tel_id if len(tel_id) > 0 else new_name
     old_names = {
         "SST-D": "SST",
         "SST-1M": "SST-1M",
@@ -429,14 +456,97 @@ def convert_telescope_model_name_to_yaml(name):
     }
 
     if new_name not in old_names:
-        raise ValueError(f"Telescope name {name} could not be converted to yml names")
+        raise ValueError(f"Telescope name {name}/{new_name} could not be converted to yml names")
 
     return old_names[new_name]
 
 
-def simtools_instrument_name(site, telescope_class_name, sub_system_name, telescope_id_name):
+def array_element_id_from_telescope_model_name(site, telescope_model_name):
+    """
+    Array element ID (CTAO convention) from telescope model name.
+    This returns e.g., "LSTN" for any LST telescope in the North site.
+    If a telescope number is given, it adds it as e.g., "LSTN-01".
+
+    Parameters
+    ----------
+    site: str
+        Observatory site (e.g., South or North)
+    telescope_class_name: str
+        Name of the telescope class (e.g. LST-1, LST-D234, MST-FlashCam-D, ...)
+
+    Returns
+    -------
+    str
+        Array element ID (CTAO style).
+
+    """
+
+    _class, _type, _tel_id = split_telescope_model_name(telescope_model_name)
+    _id = _class.upper() + site[0].upper()
+    if _tel_id.isdigit():
+        _id += f"-{int(_tel_id):02d}"
+    return _id
+
+
+def telescope_model_name_from_array_element_id(
+    array_element_id, sub_system_name="structure", available_telescopes=None
+):
+    """
+    Telescope model name from array element ID (CTAO convention).
+    Does not include the site in the returned name (e.g., returns
+    South-MST-FlashCam-1 for MSTS-01; this method is quite finetuned).
+
+    Parameters
+    ----------
+    array_element_id: str
+        Array element ID (CTAO convention).
+    available_telescopes: list
+        List of available telescopes.
+
+    Returns
+    -------
+    str
+        Telescope model name.
+    """
+
+    name_parts = array_element_id.split("-")
+    try:
+        _class = name_parts[0][0:3]
+        _site = validate_site_name(name_parts[0][3])
+    except IndexError as exc:
+        _logger.error("Invalid array element ID %s", array_element_id)
+        raise exc
+    try:
+        _id = int(name_parts[1])
+    except (ValueError, IndexError):
+        _id = "D"
+
+    if _class in ("LST", "SCT"):
+        sub_system_name = None
+    elif _class == "MST" and sub_system_name.lower() == "camera":
+        sub_system_name = "NectarCam" if _site == "North" else "FlashCam"
+
+    _simtools_name = get_telescope_name_db(
+        site=_site,
+        telescope_class_name=_class,
+        sub_system_name=sub_system_name,
+        telescope_id_name=_id,
+    )
+    if available_telescopes is not None and _simtools_name not in available_telescopes:
+        _logger.debug("Telescope %s not available", _simtools_name)
+        _simtools_name = get_telescope_name_db(
+            site=_site,
+            telescope_class_name=_class,
+            sub_system_name=sub_system_name,
+            telescope_id_name="D234" if _site == "North" and _class == "LST" else "D",
+        )
+    return _simtools_name.split("-", 1)[1]
+
+
+def get_telescope_name_db(site, telescope_class_name, sub_system_name, telescope_id_name):
     """
     Instrument name following simtools naming convention
+    Examples are North-LST-1, North-MST-NectarCam-D, or South-SST-Structure-D.
 
     Parameters
     ----------
@@ -444,8 +554,8 @@ def simtools_instrument_name(site, telescope_class_name, sub_system_name, telesc
         South or North.
     telescope_class_name: str
         LST, MST, ...
-    sub_system_name: str
-        FlashCam, NectarCam
+    sub_system_name: str or None
+        FlashCam, NectarCam, Structure
     telescope_id_name: str
         telescope ID (e.g., D, numerical value)
 
@@ -458,9 +568,8 @@ def simtools_instrument_name(site, telescope_class_name, sub_system_name, telesc
     return (
         validate_site_name(site)
         + "-"
-        + validate_name(telescope_class_name, all_telescope_class_names)
-        + "-"
-        + validate_sub_system_name(sub_system_name)
+        + _validate_name(telescope_class_name, all_telescope_class_names)
+        + ("" if sub_system_name is None else "-" + validate_sub_system_name(sub_system_name))
         + "-"
         + validate_telescope_id_name(telescope_id_name)
     )
@@ -497,7 +606,7 @@ def simtel_telescope_config_file_name(
     return name
 
 
-def simtel_array_config_file_name(array_name, site, version, label):
+def simtel_array_config_file_name(array_name, site, model_version, label):
     """
     sim_telarray config file name for an array.
 
@@ -507,7 +616,7 @@ def simtel_array_config_file_name(array_name, site, version, label):
         Prod5, ...
     site: str
         South or North.
-    version: str
+    model_version: str
         Version of the model.
     label: str
         Instance label.
@@ -517,7 +626,7 @@ def simtel_array_config_file_name(array_name, site, version, label):
     str
         File name.
     """
-    name = f"CTA-{array_name}-{site}-{version}"
+    name = f"CTA-{array_name}-{site}-{model_version}"
     name += f"_{label}" if label is not None else ""
     name += ".cfg"
     return name
@@ -783,9 +892,9 @@ def camera_efficiency_log_file_name(site, telescope_model_name, zenith_angle, az
     return name
 
 
-def get_telescope_type(telescope_name):
+def get_telescope_class(telescope_name):
     """
-    Guess telescope type from name, e.g. "LST", "MST", ...
+    Guess telescope class from name, e.g. "LST", "MST", ...
 
     Parameters
     ----------
@@ -798,49 +907,24 @@ def get_telescope_type(telescope_name):
         Telescope type.
     """
 
-    _tel_class, _ = split_telescope_model_name(telescope_name)
-    try:
-        for _class in all_telescope_class_names:
-            if len(_class) == 3 and _tel_class[0:3] == _class:
-                return _class
-            if _tel_class == _class:
-                return _class
-    except IndexError:
-        pass
-
-    return ""
-
-
-def translate_corsika_to_simtools(corsika_par):
-    """
-    Translate the name of a CORSIKA parameter to the name used in simtools.
-
-    Parameters
-    ----------
-    corsika_par: str
-        Name of the corsika parameter to be translated.
-
-    """
-
-    try:
-        return corsika_to_simtools_names[corsika_par]
-    except KeyError:
-        msg = f"Translation not found. We will proceed with the original parameter name:\
-            {corsika_par}."
-        _logger.debug(msg)
-        return corsika_par
+    _tel_class, _, _ = split_telescope_model_name(telescope_name)
+    return _tel_class
 
 
 def translate_simtools_to_corsika(simtools_par):
     """
     Translate the name of a simtools parameter to the name used in CORSIKA.
 
+    TODO - this will go with the new simulation model
+
     Parameters
     ----------
     simtools_par: str
         Name of the simtools parameter to be translated.
     """
 
+    corsika_to_simtools_names = {"OBSLEV": "corsika_obs_level"}
+
     simtools_to_corsika_names = {
         new_key: new_value for new_value, new_key in corsika_to_simtools_names.items()
     }

simtools/visualization/visualize.py

@@ -563,7 +563,7 @@ def get_telescope_patch(name, x, y, radius):
         Instance of mpatches.Circle.
     """
     tel_obj = leg_h.TelescopeHandler()
-    valid_name = names.get_telescope_type(name)
+    valid_name = names.get_telescope_class(name)
     fill_flag = False
 
     x = x.to(u.m)
@@ -647,7 +647,7 @@ def plot_array(telescopes, rotate_angle=0, show_tel_label=False):
         for tel_type in tel_counters:
             if tel_type in tel_now["telescope_name"]:
                 tel_counters[tel_type] += 1
-        i_tel_name = names.get_telescope_type(telescopes[i_tel]["telescope_name"])
+        i_tel_name = names.get_telescope_class(telescopes[i_tel]["telescope_name"])
         patches.append(
             get_telescope_patch(
                 i_tel_name,