merge with main

Author: jbuces

dl1_data_handler/reader.py

@@ -472,6 +472,10 @@ def __init__(
                     "cam_coord_offset_x",
                     "cam_coord_offset_y",
                     "cam_coord_distance",
+                    "true_core_x",
+                    "true_core_y",
+                    "true_h_first_int",
+                    "true_x_max"
                 ]
             )
         elif self.process_type == ProcessType.Observation:
@@ -605,6 +609,8 @@ def _construct_mono_example_identifiers(self):
                 events = self._transform_to_sky_spher_offsets(events)
                 # Add the logarithm of the true energy in TeV
                 events = self._transform_to_log_energy(events)
+                # Add the impact radius
+                events = self._transform_to_impact_radius(events)
                 # Add the true shower primary class to the table based on the filename
                 # is signal or background input file list
                 true_shower_primary_class = (
@@ -779,6 +785,8 @@ def _multiplicity_cut_subarray(table, key_colnames):
             if self.process_type == ProcessType.Simulation:
                 # Add the logarithm of the true energy in TeV
                 events = self._transform_to_log_energy(events)
+                # Add the impact radius
+                events = self._transform_to_impact_radius(events)
                 # Add the true shower primary class to the table based on the filename
                 # is signal or background input file list
                 true_shower_primary_class = (
@@ -894,6 +902,30 @@ def _transform_to_log_energy(self, table):
         table.add_column(np.log10(table["true_energy"]), name="log_true_energy")
         return table
 
+    def _transform_to_impact_radius(self, table) -> Table:
+        """
+        Transform core coordinates to impact radius.
+
+        This method calculates the impact radius from the core coordinates
+        in the provided table. The impact radius is the distance from the
+        true core position to the subarray center.
+
+        Parameters:
+        -----------
+        table : astropy.table.Table
+            A Table containing the true core coordinates.
+
+        Returns:
+        --------
+        table : astropy.table.Table
+            A Table with the impact radius added as a new column.
+        """
+        # Calculate the impact radius
+        impact_radius = np.sqrt(table["true_core_x"]**2 + table["true_core_y"]**2)
+        # Add the impact radius to the table
+        table.add_column(impact_radius, name="impact_radius")
+        return table
+
     def _transform_to_cam_coord_offsets(self, table) -> Table:
         """
         Transform Alt/Az coordinates to camera coordinate offsets w.r.t. the telescope pointing.

dl1_data_handler/tests/test_reader.py

@@ -1,5 +1,6 @@
 import pytest
 from traitlets.config.loader import Config
+import numpy as np
 
 from dl1_data_handler.reader import DLImageReader, DLWaveformReader
 
@@ -20,6 +21,16 @@ def test_dl1_image_reading(dl1_image_reader):
     mono_batch = dl1_image_reader.generate_mono_batch([0])
     assert mono_batch["tel_id"] == 4  # nosec
     assert mono_batch["features"].shape == (1, 110, 110, 2)  # nosec
+    # Check that the columns that are kept have no NaN values
+    for col in dl1_image_reader.example_ids_keep_columns:
+        assert not np.isnan(mono_batch[col][0])  # nosec
+    # Check that the transformation is also present and has no NaN values
+    assert mono_batch["log_true_energy"][0] == np.log10(
+        mono_batch["true_energy"][0]
+    )  # nosec
+    assert mono_batch["impact_radius"][0] == np.sqrt(
+        mono_batch["true_core_y"][0] ** 2 + mono_batch["true_core_x"][0] ** 2
+    )  # nosec
 
 
 def test_r1_waveform_reading(r1_tmp_path, r1_gamma_file):
@@ -46,7 +57,7 @@ def test_r1_waveform_reading(r1_tmp_path, r1_gamma_file):
 def test_dl1_hillas_parameter_extraction(dl1_image_reader):
     """Test DL1 reader extracts hillas parameters correctly and handles missing keys."""
 
-    hillas_names_1 =  dl1_image_reader.dl1b_parameter_colnames
+    hillas_names_1 = dl1_image_reader.dl1b_parameter_colnames
 
     hillas_names_2 = [
         "obs_id",

environment.yml

@@ -10,7 +10,7 @@ dependencies:
     - numpy
     - scipy
     - pip
-    - ctapipe==0.25.1
+    - ctapipe>=0.22,<0.26
     - traitlets
     - pyyaml
     - pandas