also exclude DL2 telescope merging when tel-wise merge is selected

use data format defs in merge tool tests

Author: TjarkMiener

src/ctapipe/io/hdf5dataformat.py

@@ -43,6 +43,7 @@
     "DL2_TEL_GEOMETRY_GROUP",
     "DL2_TEL_ENERGY_GROUP",
     "DL2_TEL_PARTICLETYPE_GROUP",
+    "DL2_TEL_IMPACT_GROUP",
     "DL0_TEL_POINTING_GROUP",
     "DL1_SUBARRAY_POINTING_GROUP",
     "DL1_TEL_POINTING_GROUP",
@@ -104,6 +105,7 @@
 DL2_TEL_GEOMETRY_GROUP = "/dl2/event/telescope/geometry"
 DL2_TEL_ENERGY_GROUP = "/dl2/event/telescope/energy"
 DL2_TEL_PARTICLETYPE_GROUP = "/dl2/event/telescope/particle_type"
+DL2_TEL_IMPACT_GROUP = "/dl2/event/telescope/impact"
 
 DL2_GROUP = "/dl2"
 DL2_SUBARRAY_GROUP = "/dl2/event/subarray"

src/ctapipe/io/hdf5merger.py

@@ -223,11 +223,11 @@ def __init__(self, output_path=None, **kwargs):
             )
         self.combine_telescope_data = self.merge_strategy == "combine-telescope-data"
         if self.combine_telescope_data and (
-            not self.telescope_events or self.dl2_subarray
+            not self.telescope_events or self.dl2_telescope or self.dl2_subarray
         ):
             raise traits.TraitError(
                 "Merge strategy 'combine-telescope-data' requires telescope_events=True "
-                "and dl2_subarray=False"
+                "and dl2_telescope=False and dl2_subarray=False"
             )
 
         output_exists = self.output_path.exists()

src/ctapipe/tools/tests/test_merge.py

@@ -14,6 +14,14 @@
 from ctapipe.core import ToolConfigurationError, run_tool
 from ctapipe.io import DataWriter, EventSource, TableLoader
 from ctapipe.io.astropy_helpers import read_table
+from ctapipe.io.hdf5dataformat import (
+    DL1_TEL_MUON_GROUP,
+    DL2_EVENT_STATISTICS_GROUP,
+    DL2_SUBARRAY_GEOMETRY_GROUP,
+    OBSERVATION_BLOCK_TABLE,
+    SCHEDULING_BLOCK_TABLE,
+    SIMULATION_IMAGES_GROUP,
+)
 from ctapipe.io.tests.test_astropy_helpers import assert_table_equal
 from ctapipe.tools.process import ProcessorTool
 
@@ -108,7 +116,7 @@ def test_skip_images(tmp_path, dl1_file, dl1_proton_file):
         assert "images" in f.root.simulation.event.telescope
         assert "parameters" in f.root.dl1.event.telescope
 
-    t = read_table(output, "/simulation/event/telescope/images/tel_001")
+    t = read_table(output, f"{SIMULATION_IMAGES_GROUP}/tel_001")
     assert "true_image" not in t.colnames
     assert "true_image_sum" in t.colnames
 
@@ -128,13 +136,13 @@ def test_dl2(tmp_path, dl2_shower_geometry_file, dl2_proton_geometry_file):
     )
 
     table1 = read_table(
-        dl2_shower_geometry_file, "/dl2/event/subarray/geometry/HillasReconstructor"
+        dl2_shower_geometry_file, f"{DL2_SUBARRAY_GEOMETRY_GROUP}/HillasReconstructor"
     )
     table2 = read_table(
-        dl2_proton_geometry_file, "/dl2/event/subarray/geometry/HillasReconstructor"
+        dl2_proton_geometry_file, f"{DL2_SUBARRAY_GEOMETRY_GROUP}/HillasReconstructor"
     )
     table_merged = read_table(
-        output, "/dl2/event/subarray/geometry/HillasReconstructor"
+        output, f"{DL2_SUBARRAY_GEOMETRY_GROUP}/HillasReconstructor"
     )
 
     diff = StringIO()
@@ -143,7 +151,7 @@ def test_dl2(tmp_path, dl2_shower_geometry_file, dl2_proton_geometry_file):
         f"Merged table not equal to individual tables. Diff:\n {diff.getvalue()}"
     )
 
-    stats_key = "/dl2/service/tel_event_statistics/HillasReconstructor"
+    stats_key = f"{DL2_EVENT_STATISTICS_GROUP}/HillasReconstructor"
     merged_stats = read_table(output, stats_key)
     stats1 = read_table(dl2_shower_geometry_file, stats_key)
     stats2 = read_table(dl2_proton_geometry_file, stats_key)
@@ -152,8 +160,8 @@ def test_dl2(tmp_path, dl2_shower_geometry_file, dl2_proton_geometry_file):
         assert np.all(merged_stats[col] == (stats1[col] + stats2[col]))
 
     # test reading configurations as well:
-    obs = read_table(output, "/configuration/observation/observation_block")
-    sbs = read_table(output, "/configuration/observation/scheduling_block")
+    obs = read_table(output, OBSERVATION_BLOCK_TABLE)
+    sbs = read_table(output, SCHEDULING_BLOCK_TABLE)
 
     assert len(obs) == 2, "should have two OB entries"
     assert len(sbs) == 2, "should have two SB entries"
@@ -182,8 +190,8 @@ def test_muon(tmp_path, dl1_muon_output_file):
         raises=True,
     )
 
-    table = read_table(output, "/dl1/event/telescope/muon/tel_001")
-    input_table = read_table(dl1_muon_output_file, "/dl1/event/telescope/muon/tel_001")
+    table = read_table(output, f"{DL1_TEL_MUON_GROUP}/tel_001")
+    input_table = read_table(dl1_muon_output_file, f"{DL1_TEL_MUON_GROUP}/tel_001")
 
     n_input = len(input_table)
     assert len(table) == n_input
@@ -365,6 +373,7 @@ def test_merge_telescope_data(tmp_path, prod6_gamma_simtel_path):
                 str(outputs["sub2"]),
                 f"--output={outputs[merged_mode_name]}",
                 "--telescope-events",
+                "--no-dl2-telescope",
                 "--no-dl2-subarray",
                 "--combine-telescope-data",
             ],
@@ -410,16 +419,16 @@ def test_merge_telescope_data(tmp_path, prod6_gamma_simtel_path):
             argv=[
                 *argv_options,
                 "--telescope-events",
+                "--no-dl2-telescope",
                 "--no-dl2-subarray",
             ],
             cwd=tmp_path,
             raises=True,
         )
 
     # Check that merging files with incompatible options raises a TraitError
-    with pytest.raises(
-        traits.TraitError, match="Merge strategy 'combine-telescope-data' requires"
-    ):
+    traits_error_msg = "Merge strategy 'combine-telescope-data' requires"
+    with pytest.raises(traits.TraitError, match=traits_error_msg):
         run_tool(
             MergeTool(),
             argv=[
@@ -430,20 +439,30 @@ def test_merge_telescope_data(tmp_path, prod6_gamma_simtel_path):
             cwd=tmp_path,
             raises=True,
         )
-    with pytest.raises(
-        traits.TraitError, match="Merge strategy 'combine-telescope-data' requires"
-    ):
+    with pytest.raises(traits.TraitError, match=traits_error_msg):
         run_tool(
             MergeTool(),
             argv=[
                 *argv_options,
                 "--telescope-events",
+                "--no-dl2-telescope",
                 "--dl2-subarray",
             ],
             cwd=tmp_path,
             raises=True,
         )
-
+    with pytest.raises(traits.TraitError, match=traits_error_msg):
+        run_tool(
+            MergeTool(),
+            argv=[
+                *argv_options,
+                "--telescope-events",
+                "--dl2-telescope",
+                "--no-dl2-subarray",
+            ],
+            cwd=tmp_path,
+            raises=True,
+        )
     # Check that merging files. with different data levels raises an error
     # When combining telescope data, data levels must match.
     run_tool(
@@ -465,6 +484,7 @@ def test_merge_telescope_data(tmp_path, prod6_gamma_simtel_path):
                 "--telescope-events",
                 "--combine-telescope-data",
                 "--no-dl2-subarray",
+                "--no-dl2-telescope",
                 f"--output={outputs['required_node_invalid']}",
             ],
             cwd=tmp_path,