gammasimtools 0.10.0__py3-none-any.whl → 0.12.0__py3-none-any.whl

simtools/schemas/model_parameters/iobuf_maximum.schema.yml

@@ -15,7 +15,7 @@ data:
     allowed_range:
       min: 100000
 instrument:
-  class: Camera
+  class: configuration_sim_telarray
   type:
     - LSTN
     - LSTS

simtools/schemas/model_parameters/iobuf_output_maximum.schema.yml

@@ -15,7 +15,7 @@ data:
     allowed_range:
       min: 100000
 instrument:
-  class: Camera
+  class: configuration_sim_telarray
   type:
     - LSTN
     - LSTS

simtools/schemas/model_parameters/lightguide_efficiency_vs_incidence_angle.schema.yml

@@ -3,7 +3,7 @@
 title: Schema for lightguide_efficiency_vs_incidence_angle model parameter
 version: 0.1.0
 meta_schema: simpipe-schema
-meta_schema_url: https://raw.githubusercontent.com/gammasim/simtools/main/src/simtools/schemas/data.metaschema.yml
+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
 name: lightguide_efficiency_vs_incidence_angle
 developer_note: |-

simtools/schemas/model_parameters/lightguide_efficiency_vs_wavelength.schema.yml

@@ -3,7 +3,7 @@
 title: Schema for lightguide_efficiency_vs_wavelength model parameter
 version: 0.1.0
 meta_schema: simpipe-schema
-meta_schema_url: https://raw.githubusercontent.com/gammasim/simtools/main/src/simtools/schemas/data.metaschema.yml
+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
 name: lightguide_efficiency_vs_wavelength
 developer_note: |-

simtools/schemas/model_parameters/min_photoelectrons.schema.yml

@@ -16,7 +16,7 @@ data:
     unit: dimensionless
     default: -1
 instrument:
-  class: Camera
+  class: configuration_sim_telarray
   type:
     - LSTN
     - LSTS

simtools/schemas/model_parameters/min_photons.schema.yml

@@ -13,7 +13,7 @@ data:
     unit: dimensionless
     default: -1
 instrument:
-  class: Camera
+  class: configuration_sim_telarray
   type:
     - LSTN
     - LSTS

simtools/schemas/model_parameters/random_generator.schema.yml

@@ -17,7 +17,7 @@ data:
   - type: string
     default: "Ranlux"
 instrument:
-  class: Camera
+  class: configuration_sim_telarray
   type:
     - LSTN
     - LSTS

simtools/schemas/model_parameters/sampled_output.schema.yml

@@ -12,7 +12,7 @@ data:
   - type: boolean
     default: true
 instrument:
-  class: Camera
+  class: configuration_sim_telarray
   type:
     - LSTN
     - LSTS

simtools/schemas/model_parameters/save_pe_with_amplitude.schema.yml

@@ -15,7 +15,7 @@ data:
   - type: boolean
     default: false
 instrument:
-  class: Camera
+  class: configuration_sim_telarray
   type:
     - LSTN
     - LSTS

simtools/schemas/model_parameters/store_photoelectrons.schema.yml

@@ -22,7 +22,7 @@ data:
       min: 0
       max: 10000
 instrument:
-  class: Camera
+  class: configuration_sim_telarray
   type:
     - LSTN
     - LSTS

simtools/schemas/model_parameters/tailcut_scale.schema.yml

@@ -19,7 +19,7 @@ data:
       min: 0.0
       max: 10.0
 instrument:
-  class: Camera
+  class: configuration_sim_telarray
   type:
     - LSTN
     - LSTS

simtools/schemas/production_tables.schema.yml

@@ -29,7 +29,7 @@ definitions:
             pattern: '^\d+\.\d+\.\d+$'
         propertyNames:
           description: Allowed parameter name patterns.
-          pattern: '^([A-Za-z](ST|LL)[N,S,x]-\d{2,3}|[A-Za-z](ST|LL)[N,S,x]-design|OBS-(North|South)|Dummy-Telescope)$'
+          pattern: '^([A-Za-z](ST|LL)[N,S,x]-\d{2,3}|[A-Za-z](ST|LL)[N,S,x]-(design|FlashCam|NectarCam)|OBS-(North|South)|Dummy-Telescope)$'
       design_model:
         type: object
         description: Design models.

simtools/simtel/simtel_config_reader.py

@@ -153,8 +153,7 @@ class SimtelConfigReader:
 
         """
         self._logger.debug(
-            f"Reading simtel config file {simtel_config_file} "
-            f"for parameter {self.parameter_name}"
+            f"Reading simtel config file {simtel_config_file} for parameter {self.parameter_name}"
         )
         matching_lines = {}
         try:

simtools/simtel/simtel_config_writer.py

@@ -72,8 +72,7 @@ class SimtelConfigWriter:
 
             file.write("#ifdef TELESCOPE\n")
             file.write(
-                f"   echo Configuration for {self._telescope_model_name}"
-                " - TELESCOPE $(TELESCOPE)\n"
+                f"   echo Configuration for {self._telescope_model_name} - TELESCOPE $(TELESCOPE)\n"
             )
             file.write("#endif\n\n")
 

simtools/simtel/simtel_io_histogram.py

@@ -419,7 +419,6 @@ class SimtelIOHistogram:
         return {
             "simtel_array_file": self.histogram_file,
             "simulation_input": self.print_info(mode="silent"),
-            # pylint: disable=E1101
             "system_trigger_rate (Hz)": self.trigger_rate.value,
         }
 

simtools/simtel/simtel_io_histograms.py

@@ -219,8 +219,8 @@ class SimtelIOHistograms:
         )
 
         stacked_num_simulated_events, stacked_num_triggered_events = self.get_stacked_num_events()
-        logging.info("Total number of simulated events: " f"{stacked_num_simulated_events} events")
-        logging.info("Total number of triggered events: " f"{stacked_num_triggered_events} events")
+        logging.info(f"Total number of simulated events: {stacked_num_simulated_events} events")
+        logging.info(f"Total number of triggered events: {stacked_num_triggered_events} events")
         obs_time = simtel_hist_instance.estimate_observation_time(stacked_num_simulated_events)
         logging.info(
             "Estimated equivalent observation time corresponding to the number of"
@@ -239,9 +239,7 @@ class SimtelIOHistograms:
         )
         logging.info(
             f"System trigger event rate for stacked files: "
-            # pylint: disable=E1101
             f"{triggered_event_rate.value:.4e} \u00b1 "
-            # pylint: disable=E1101
             f"{triggered_event_rate_uncertainty.value:.4e} Hz"
         )
         return (

simtools/simtel/simulator_camera_efficiency.py

@@ -72,9 +72,7 @@ class SimulatorCameraEfficiency(SimtelRunner):
                 / Path(self._telescope_model.get_parameter_value("nsb_reference_spectrum")).name
             )
 
-    def _make_run_command(
-        self, run_number=None, input_file=None
-    ):  # pylint: disable=unused-argument
+    def _make_run_command(self, run_number=None, input_file=None):  # pylint: disable=unused-argument
         """Prepare the command used to run testeff."""
         self._logger.debug("Preparing the command to run testeff")
 

simtools/simtel/simulator_light_emission.py

@@ -234,7 +234,6 @@ class SimulatorLightEmission(SimtelRunner):
         command += f"/{self.le_application[0]}"
 
         if self.light_source_type == "led":
-
             if self.le_application[1] == "variable":
                 command += f" -x {self.default_le_config['x_pos']['default'].to(u.cm).value}"
                 command += f" -y {self.default_le_config['y_pos']['default'].to(u.cm).value}"
@@ -245,7 +244,6 @@ class SimulatorLightEmission(SimtelRunner):
                 command += f" -n {self.photons_per_run}"
 
             elif self.le_application[1] == "layout":
-
                 x_origin = x_cal - x_tel
                 y_origin = y_cal - y_tel
                 z_origin = z_cal - z_tel
@@ -291,7 +289,7 @@ class SimulatorLightEmission(SimtelRunner):
 
             command += f" --telescope-theta {angle_theta}"
             command += f" --telescope-phi {angle_phi}"
-            command += f" --laser-theta {90-angles[2]}"
+            command += f" --laser-theta {90 - angles[2]}"
             command += f" --laser-phi {angles[3]}"  # convention north (x) towards east (-y)
             command += f" --atmosphere {_model_directory}/"
             command += f"{self._telescope_model.get_parameter_value('atmospheric_profile')}"
@@ -352,8 +350,7 @@ class SimulatorLightEmission(SimtelRunner):
         )
         command += super().get_config_option(
             "output_file",
-            f"{self.output_directory}/"
-            f"{self.le_application[0]}_{self.le_application[1]}.simtel.gz",
+            f"{self.output_directory}/{self.le_application[0]}_{self.le_application[1]}.simtel.gz",
         )
         command += super().get_config_option(
             "histogram_file",

simtools/simtel/simulator_ray_tracing.py

@@ -136,9 +136,7 @@ class SimulatorRayTracing(SimtelRunner):
             self._logger.debug("For single mirror mode, need to prepare the single pixel camera.")
             self._write_out_single_pixel_camera_file()
 
-    def _make_run_command(
-        self, run_number=None, input_file=None
-    ):  # pylint: disable=unused-argument
+    def _make_run_command(self, run_number=None, input_file=None):  # pylint: disable=unused-argument
         """Generate simtel_array run command."""
         if self.config.single_mirror_mode:
             # Note: no mirror length defined for dual-mirror telescopes

simtools/testing/configuration.py

@@ -71,7 +71,8 @@ def _read_configs_from_files(config_files):
         _dict = gen.remove_substring_recursively_from_dict(
             gen.collect_data_from_file(file_name=config_file), substring="\n"
         )
-        configs.append(_dict.get("CTA_SIMPIPE", None))
+        for application in _dict.get("CTA_SIMPIPE", {}).get("APPLICATIONS", []):
+            configs.append(application)
     return configs
 
 

simtools/testing/validate_output.py

@@ -37,17 +37,7 @@ def validate_application_output(config, from_command_line=None, from_config_file
         _logger.info(f"Testing application output: {integration_test}")
 
         if from_command_line == from_config_file:
-            if "REFERENCE_OUTPUT_FILE" in integration_test:
-                _validate_reference_output_file(config, integration_test)
-
-            if "TEST_OUTPUT_FILES" in integration_test:
-                _validate_output_path_and_file(config, integration_test["TEST_OUTPUT_FILES"])
-
-            if "OUTPUT_FILE" in integration_test:
-                _validate_output_path_and_file(
-                    config,
-                    [{"PATH_DESCRIPTOR": "OUTPUT_PATH", "FILE": integration_test["OUTPUT_FILE"]}],
-                )
+            _validate_output_files(config, integration_test)
 
             if "FILE_TYPE" in integration_test:
                 assert assertions.assert_file_type(
@@ -59,6 +49,19 @@ def validate_application_output(config, from_command_line=None, from_config_file
         _test_simtel_cfg_files(config, integration_test, from_command_line, from_config_file)
 
 
+def _validate_output_files(config, integration_test):
+    """Validate output files."""
+    if "REFERENCE_OUTPUT_FILE" in integration_test:
+        _validate_reference_output_file(config, integration_test)
+    if "TEST_OUTPUT_FILES" in integration_test:
+        _validate_output_path_and_file(config, integration_test["TEST_OUTPUT_FILES"])
+    if "OUTPUT_FILE" in integration_test:
+        _validate_output_path_and_file(
+            config,
+            [{"PATH_DESCRIPTOR": "OUTPUT_PATH", "FILE": integration_test["OUTPUT_FILE"]}],
+        )
+
+
 def _test_simtel_cfg_files(config, integration_test, from_command_line, from_config_file):
     """Test simtel cfg files."""
     test_simtel_cfg_file = integration_test.get("TEST_SIMTEL_CFG_FILES", {}).get(
@@ -141,6 +144,7 @@ def compare_json_or_yaml_files(file1, file2, tolerance=1.0e-2):
     Compare two json or yaml files.
 
     Take into account float comparison for sim_telarray string-embedded floats.
+    Allow differences in 'schema_version' field.
 
     Parameters
     ----------
@@ -159,6 +163,8 @@ def compare_json_or_yaml_files(file1, file2, tolerance=1.0e-2):
     """
     data1 = gen.collect_data_from_file(file1)
     data2 = gen.collect_data_from_file(file2)
+    data1.pop("schema_version", None)
+    data2.pop("schema_version", None)
 
     _logger.debug(f"Comparing json/yaml files: {file1} and {file2}")
 
@@ -181,7 +187,7 @@ def compare_json_or_yaml_files(file1, file2, tolerance=1.0e-2):
     return _comparison
 
 
-def _compare_value_from_parameter_dict(data1, data2, tolerance):
+def _compare_value_from_parameter_dict(data1, data2, tolerance=1.0e-5):
     """Compare value fields given in different formats."""
 
     def _as_list(value):
@@ -193,7 +199,11 @@ def _compare_value_from_parameter_dict(data1, data2, tolerance):
 
     _logger.info(f"Comparing values: {data1} and {data2} (tolerance: {tolerance})")
 
-    return np.allclose(_as_list(data1), _as_list(data2), rtol=tolerance)
+    _as_list_1 = _as_list(data1)
+    _as_list_2 = _as_list(data2)
+    if isinstance(_as_list_1, str):
+        return _as_list_1 == _as_list_2
+    return np.allclose(_as_list_1, _as_list_2, rtol=tolerance)
 
 
 def compare_ecsv_files(file1, file2, tolerance=1.0e-5, test_columns=None):

simtools/utils/general.py

@@ -1,6 +1,7 @@
 """General functions useful across different parts of the code."""
 
 import copy
+import datetime
 import json
 import logging
 import os
@@ -743,7 +744,7 @@ def convert_list_to_string(data, comma_separated=False, shorten_list=False, coll
     return " ".join(str(item) for item in data)
 
 
-def convert_string_to_list(data_string, is_float=True):
+def convert_string_to_list(data_string, is_float=True, force_comma_separation=False):
     """
     Convert string (as used e.g. in sim_telarray) to list.
 
@@ -753,6 +754,10 @@ def convert_string_to_list(data_string, is_float=True):
     ----------
     data_string: object
         String to be converted
+    is_float: bool
+        If True, convert to float, otherwise to int.
+    force_comma_separation: bool
+        If True, force comma separation.
 
     Returns
     -------
@@ -770,7 +775,7 @@ def convert_string_to_list(data_string, is_float=True):
     if "," in data_string:
         result = data_string.split(",")
         return [item.strip() for item in result]
-    if " " in data_string:
+    if " " in data_string and not force_comma_separation:
         return data_string.split()
     return data_string
 
@@ -922,3 +927,8 @@ def get_list_of_files_from_command_line(file_names, suffix_list):
             _logger.error(f"{one_file} is not a file.")
             raise FileNotFoundError from exc
     return _files
+
+
+def now_date_time_in_isoformat():
+    """Return date and time in isoformat and second accuracy."""
+    return datetime.datetime.now(datetime.UTC).isoformat(timespec="seconds")