From 3d7e62862fa389839f5e1716f8c221662dc2cb74 Mon Sep 17 00:00:00 2001 From: Lukas Beiske Date: Mon, 6 Nov 2023 11:50:35 +0100 Subject: [PATCH] Adapt relevant tests --- ctapipe/tools/tests/test_apply_models.py | 5 ++--- ctapipe/tools/tests/test_process_ml.py | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ctapipe/tools/tests/test_apply_models.py b/ctapipe/tools/tests/test_apply_models.py index 32b0e4bcc86..1075cb13bc3 100644 --- a/ctapipe/tools/tests/test_apply_models.py +++ b/ctapipe/tools/tests/test_apply_models.py @@ -208,9 +208,8 @@ def test_apply_all( assert f"{prefix_disp}_tel_alt" in tel_events.colnames assert f"{prefix_disp}_tel_az" in tel_events.colnames assert f"{prefix_disp}_tel_is_valid" in tel_events.colnames - assert f"{prefix_disp}_parameter_norm" in tel_events.colnames - assert f"{prefix_disp}_parameter_is_valid" in tel_events.colnames - assert f"{prefix_disp}_parameter_tel_is_valid" not in tel_events.colnames + assert f"{prefix_disp}_tel_parameter" in tel_events.colnames + assert f"{prefix_disp}_parameter" not in tel_events.colnames # check that the "--no-dl1-parameters" option worked assert "hillas_intensity" not in tel_events.colnames diff --git a/ctapipe/tools/tests/test_process_ml.py b/ctapipe/tools/tests/test_process_ml.py index a4fb75d428d..6a25f503aa5 100644 --- a/ctapipe/tools/tests/test_process_ml.py +++ b/ctapipe/tools/tests/test_process_ml.py @@ -161,8 +161,7 @@ def test_process_apply_disp( run_tool(tool, argv=argv, cwd=tmp_path, raises=True) tel_events = read_table(output, "/dl2/event/telescope/disp/disp/tel_004") - assert "disp_parameter_norm" in tel_events.colnames - assert "disp_parameter_is_valid" in tel_events.colnames + assert "disp_tel_parameter" in tel_events.colnames tel_events = read_table(output, "/dl2/event/telescope/geometry/disp/tel_004") assert "disp_tel_alt" in tel_events.colnames