gammasimtools 0.18.0__py3-none-any.whl → 0.20.0__py3-none-any.whl

simtools/schemas/model_parameters/trigger_delay_compensation.schema.yml

@@ -1,7 +1,7 @@
 %YAML 1.2
 ---
 title: Schema for trigger_delay_compensation model parameter
-version: 0.1.0
+schema_version: 0.1.0
 meta_schema: simpipe-schema
 meta_schema_url: https://raw.githubusercontent.com/gammasim/simtools/main/src/simtools/schemas/model_parameter_and_data_schema.metaschema.yml
 meta_schema_version: 0.1.0

simtools/schemas/model_parameters/trigger_pixels.schema.yml

@@ -1,7 +1,7 @@
 %YAML 1.2
 ---
 title: Schema for trigger_pixels model parameter
-version: 0.1.0
+schema_version: 0.1.0
 meta_schema: simpipe-schema
 meta_schema_url: https://raw.githubusercontent.com/gammasim/simtools/main/src/simtools/schemas/model_parameter_and_data_schema.metaschema.yml
 meta_schema_version: 0.1.0

simtools/schemas/plot_configuration.metaschema.yml

@@ -3,8 +3,8 @@ $schema: http://json-schema.org/draft-06/schema#
 $ref: '#/definitions/SimtoolsPlotConfiguration'
 title: SimPipe plot configuration metaschema
 description: YAML representation of plot configuration metaschema
-version: 0.1.0
-name: plot_configuration.metaschema
+schema_version: 0.1.0
+schema_name: plot_configuration.metaschema
 type: object
 
 definitions:
@@ -99,6 +99,9 @@ definitions:
       file_name:
         type: string
         description: "Path to the data file."
+      ignore_table_data_path:
+        type: boolean
+        description: "Ignore table data path from command line."
       type:
         type: string
         description: "Type of data file."

simtools/schemas/production_configuration_metrics.schema.yml

@@ -5,8 +5,8 @@ title: Statistical Error Metrics Schema
 description: |
   YAML representation of simulation production configuration
   metrics.
-version: 0.1.0
-name: production_configuration_metrics.metaschema
+schema_version: 0.1.0
+schema_name: production_configuration_metrics.metaschema
 type: object
 additionalProperties: false
 
@@ -20,6 +20,16 @@ definitions:
         $ref: '#/definitions/ErrorMetric'
       energy_estimate:
         $ref: '#/definitions/ErrorMetric'
+      schema_version:
+        type: string
+        description: "Version of the schema."
+      schema_url:
+        type: string
+        format: uri
+        description: "URL of the schema."
+      schema_name:
+        type: string
+        description: "Name of the schema."
 
   ErrorMetric:
     type: object

simtools/schemas/production_tables.schema.yml

@@ -5,14 +5,18 @@ title: SimPipe DB Production Model Metaschema
 description: |
   YAML representation of DB production model metaschema
   (based on simulation model DB).
-version: 0.1.0
-name: production_table.metaschema
+schema_version: 0.1.0
+schema_name: production_table.metaschema
 type: object
 additionalProperties: false
 
 definitions:
   ProductionModelTable:
+    additionalProperties: false
     properties:
+      production_table_name:
+        type: string
+        description: Name of the production table.
       model_version:
         type: string
         description: Model version.
@@ -37,5 +41,6 @@ definitions:
           type: string
           description: Design model of a telescope
     required:
+      - production_table_name
       - model_version
       - parameters

simtools/simtel/simtel_config_reader.py

@@ -7,7 +7,7 @@ import re
 import astropy.units as u
 import numpy as np
 
-import simtools.utils.general as gen
+from simtools.io import ascii_handler
 from simtools.utils import names
 
 __all__ = ["SimtelConfigReader"]
@@ -81,7 +81,7 @@ class SimtelConfigReader:
 
         self.schema_file = schema_file
         self.schema_dict = (
-            gen.collect_data_from_file(file_name=self.schema_file, yaml_document=0)
+            ascii_handler.collect_data_from_file(file_name=self.schema_file, yaml_document=0)
             if self.schema_file is not None
             else None
         )

simtools/simtel/simtel_config_writer.py

@@ -10,6 +10,7 @@ import numpy as np
 
 import simtools.utils.general as gen
 import simtools.version
+from simtools.io import ascii_handler
 from simtools.utils import names
 
 __all__ = ["SimtelConfigWriter"]
@@ -141,7 +142,7 @@ class SimtelConfigWriter:
         return value
 
     def _get_sim_telarray_metadata(
-        self, config_type, model_parameters, telescope_model_name, sim_telarray_seeds=None
+        self, config_type, model_parameters, telescope_model_name, additional_metadata=None
     ):
         """
         Return sim_telarray metadata.
@@ -154,8 +155,8 @@ class SimtelConfigWriter:
             Model parameters dictionary.
         telescope_model_name: str
             Name of the telescope model
-        sim_telarray_seeds: dict
-            Dictionary with configuration for sim_telarray random instrument setup.
+        additional_metadata: dict
+            Dictionary with additional metadata to include using 'set'.
 
         Returns
         -------
@@ -196,12 +197,10 @@ class SimtelConfigWriter:
 
         self._add_model_parameters_to_metadata(model_parameters, meta_parameters, prefix)
 
-        if sim_telarray_seeds and sim_telarray_seeds.get("random_instrument_instances"):
-            meta_parameters.append(f"{prefix} set instrument_seed={sim_telarray_seeds['seed']}")
-            meta_parameters.append(
-                f"{prefix} set instrument_instances="
-                f"{sim_telarray_seeds['random_instrument_instances']}"
-            )
+        if additional_metadata:
+            for key, value in additional_metadata.items():
+                if value:
+                    meta_parameters.append(f"{prefix} set {key}={value}")
 
         return meta_parameters
 
@@ -223,7 +222,7 @@ class SimtelConfigWriter:
                 meta_parameters.append(f"{prefix} set {simtel_name}={value['value']}")
 
     def write_array_config_file(
-        self, config_file_path, telescope_model, site_model, sim_telarray_seeds=None
+        self, config_file_path, telescope_model, site_model, additional_metadata=None
     ):
         """
         Write the sim_telarray config file for an array of telescopes.
@@ -236,8 +235,8 @@ class SimtelConfigWriter:
             Dictionary of TelescopeModel's instances as used by the ArrayModel instance.
         site_model: Site model
             Site model.
-        sim_telarray_seeds: dict
-            Dictionary with configuration for sim_telarray random instrument setup.
+        additional_metadata: dict
+            Dictionary with additional metadata to include.
         """
         config_file_directory = Path(config_file_path).parent
         with open(config_file_path, "w", encoding="utf-8") as file:
@@ -262,7 +261,7 @@ class SimtelConfigWriter:
                 site_model.parameters,
                 config_file_directory,
                 telescope_model,
-                sim_telarray_seeds,
+                additional_metadata,
             )
 
             file.write(self.TAB + f"maximum_telescopes = {len(telescope_model)}\n\n")
@@ -284,8 +283,8 @@ class SimtelConfigWriter:
                 file.write(f"# include <{tel_config_file}>\n\n")
             file.write("#endif \n\n")  # configuration files need to end with \n\n
 
-        if sim_telarray_seeds and sim_telarray_seeds.get("random_instrument_instances"):
-            self._write_random_seeds_file(sim_telarray_seeds, config_file_directory)
+        if additional_metadata and additional_metadata.get("random_instrument_instances"):
+            self._write_random_seeds_file(additional_metadata, config_file_directory)
 
     def _write_random_seeds_file(self, sim_telarray_seeds, config_file_directory):
         """
@@ -404,7 +403,9 @@ class SimtelConfigWriter:
             "simtools_model_production_version": self._model_version,
         }
         try:
-            build_opts = gen.collect_data_from_file(Path(self._simtel_path) / "build_opts.yml")
+            build_opts = ascii_handler.collect_data_from_file(
+                Path(self._simtel_path) / "build_opts.yml"
+            )
             for key, value in build_opts.items():
                 meta_items[f"simtools_{key}"] = value
         except (FileNotFoundError, TypeError):
@@ -415,7 +416,7 @@ class SimtelConfigWriter:
             file.write(f"{self.TAB}metaparam global set {key} = {value}\n")
 
     def _write_site_parameters(
-        self, file, site_parameters, model_path, telescope_model, sim_telarray_seeds=None
+        self, file, site_parameters, model_path, telescope_model, additional_metadata=None
     ):
         """
         Write site parameters.
@@ -430,8 +431,8 @@ class SimtelConfigWriter:
             Path to the model for writing of additional files.
         telescope_model: dict of TelescopeModel
             Telescope models.
-        sim_telarray_seeds: dict
-            Dictionary with configuration for sim_telarray random instrument setup.
+        additional_metadata: dict
+            Dictionary with additional metadata to include.
         """
         file.write(self.TAB + "% Site parameters\n")
         for par, value in site_parameters.items():
@@ -446,7 +447,7 @@ class SimtelConfigWriter:
             if simtel_name is not None:
                 file.write(f"{self.TAB}{simtel_name} = {value}\n")
         for meta in self._get_sim_telarray_metadata(
-            "site", site_parameters, self._telescope_model_name, sim_telarray_seeds
+            "site", site_parameters, self._telescope_model_name, additional_metadata
         ):
             file.write(f"{self.TAB}{meta}\n")
         file.write("\n")
@@ -506,7 +507,9 @@ class SimtelConfigWriter:
 
         trigger_lines = {}
         for tel_type, tel_list in trigger_per_telescope_type.items():
-            trigger_dict = self._get_array_triggers_for_telescope_type(array_triggers, tel_type)
+            trigger_dict = self._get_array_triggers_for_telescope_type(
+                array_triggers, tel_type, len(tel_list)
+            )
             trigger_lines[tel_type] = f"Trigger {trigger_dict['multiplicity']['value']} of "
             trigger_lines[tel_type] += ", ".join(map(str, tel_list))
             width = trigger_dict["width"]["value"] * u.Unit(trigger_dict["width"]["unit"]).to("ns")
@@ -526,7 +529,9 @@ class SimtelConfigWriter:
 
         return array_triggers_file
 
-    def _get_array_triggers_for_telescope_type(self, array_triggers, telescope_type):
+    def _get_array_triggers_for_telescope_type(
+        self, array_triggers, telescope_type, num_telescopes_of_type
+    ):
         """
         Get array trigger for a specific telescope type.
 
@@ -536,14 +541,19 @@ class SimtelConfigWriter:
             Array trigger definitions.
         telescope_type: str
             Telescope type.
+        num_telescopes_of_type: int
+            Number of telescopes of the specified type.
 
         Returns
         -------
         dict
             Array trigger for the telescope type.
         """
+        suffix = "_array"
+        if num_telescopes_of_type == 1:
+            suffix = "_single_telescope"
         for trigger_dict in array_triggers:
-            if trigger_dict["name"] == telescope_type + "_array":
+            if trigger_dict["name"] == telescope_type + suffix:
                 return trigger_dict
         return None