From 84ceeb7b7c951d7eeb5f2fccce47961e3faad543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6se?= <stefan.froese@udo.edu>
Date: Mon, 9 Jan 2023 16:49:05 +0100
Subject: [PATCH] Merge branch 'master' into remove_hillas_cameraframe

---
 ctapipe/core/tests/test_traits.py | 15 ---------------
 ctapipe/core/tool.py              |  1 -
 ctapipe/core/traits.py            |  1 -
 ctapipe/reco/tests/test_ImPACT.py |  1 -
 docs/changes/2134.bug.rst         |  1 +
 docs/changes/2141.api.rst         |  6 ++++++
 docs/changes/2155.bug.rst         |  1 +
 docs/changes/2163.bug.rst         |  2 ++
 docs/changes/2171.bug.rst         |  1 +
 docs/changes/2173.bug.rst         |  2 ++
 10 files changed, 13 insertions(+), 18 deletions(-)
 create mode 100644 docs/changes/2134.bug.rst
 create mode 100644 docs/changes/2141.api.rst
 create mode 100644 docs/changes/2155.bug.rst
 create mode 100644 docs/changes/2163.bug.rst
 create mode 100644 docs/changes/2171.bug.rst
 create mode 100644 docs/changes/2173.bug.rst

diff --git a/ctapipe/core/tests/test_traits.py b/ctapipe/core/tests/test_traits.py
index bb5d1cf2bc4..8915b613527 100644
--- a/ctapipe/core/tests/test_traits.py
+++ b/ctapipe/core/tests/test_traits.py
@@ -363,18 +363,3 @@ def stuff(self):
 
     expected = "A list of Base subclass names. Possible values: ['Foo', 'Bar']"
     assert MyListComponent.base_names.help == expected
-
-
-@pytest.mark.parametrize(
-    "trait_type",
-    [IntTelescopeParameter, FloatTelescopeParameter, BoolTelescopeParameter],
-)
-def test_telescope_parameter_none(trait_type, mock_subarray):
-    class Foo(TelescopeComponent):
-        bar = trait_type(default_value=None, allow_none=True).tag(config=True)
-
-    assert Foo(mock_subarray).bar.tel[1] is None
-    assert Foo(mock_subarray, bar=None).bar.tel[1] is None
-
-    f = Foo(mock_subarray, bar=[("type", "*", 1), ("id", 1, None)])
-    assert f.bar.tel[1] is None
diff --git a/ctapipe/core/tool.py b/ctapipe/core/tool.py
index d58a8c825e8..e9fc0cd5741 100644
--- a/ctapipe/core/tool.py
+++ b/ctapipe/core/tool.py
@@ -389,7 +389,6 @@ def run(self, argv=None, raises=False):
                 # remove handler to not impact performance with regex matching
                 self.log.removeHandler(self.trait_warning_handler)
 
-<<<<<<< HEAD
                 self.start()
                 self.finish()
                 self.log.info(f"Finished: {self.name}")
diff --git a/ctapipe/core/traits.py b/ctapipe/core/traits.py
index a6f523d3a96..37a073b77e7 100644
--- a/ctapipe/core/traits.py
+++ b/ctapipe/core/traits.py
@@ -5,7 +5,6 @@
 import pathlib
 from urllib.parse import urlparse
 
-import numpy as np
 import traitlets
 import traitlets.config
 from astropy.time import Time
diff --git a/ctapipe/reco/tests/test_ImPACT.py b/ctapipe/reco/tests/test_ImPACT.py
index f5414f0b275..be03f45402b 100644
--- a/ctapipe/reco/tests/test_ImPACT.py
+++ b/ctapipe/reco/tests/test_ImPACT.py
@@ -6,7 +6,6 @@
 
 from ctapipe.containers import (
     HillasParametersContainer,
-    ReconstructedGeometryContainer,
     ReconstructedEnergyContainer,
     ReconstructedGeometryContainer,
 )
diff --git a/docs/changes/2134.bug.rst b/docs/changes/2134.bug.rst
new file mode 100644
index 00000000000..c6d5edbcd58
--- /dev/null
+++ b/docs/changes/2134.bug.rst
@@ -0,0 +1 @@
+Fix for Hillas lines in ``ArrayDisplay`` being wrong in the new ``EastingNorthingFrame``.
diff --git a/docs/changes/2141.api.rst b/docs/changes/2141.api.rst
new file mode 100644
index 00000000000..24eff81bb5a
--- /dev/null
+++ b/docs/changes/2141.api.rst
@@ -0,0 +1,6 @@
+Drop support for ``CameraFrame`` in ``ImageProcessor``
+
+``ImageProcessor`` now only uses the ``TelescopeFrame`` to perform all image operations.
+This also drops support for calculating the ``HillasParameters`` in ``CameraFrame``.
+
+Reading files with DL1 parameters in ``CameraFrame`` is also no longer supported.
diff --git a/docs/changes/2155.bug.rst b/docs/changes/2155.bug.rst
new file mode 100644
index 00000000000..7d78ca6fa76
--- /dev/null
+++ b/docs/changes/2155.bug.rst
@@ -0,0 +1 @@
+Replace usage of ``$HOME`` with ``Path.home()`` for cross-platform compatibility.
diff --git a/docs/changes/2163.bug.rst b/docs/changes/2163.bug.rst
new file mode 100644
index 00000000000..cd3a77f1336
--- /dev/null
+++ b/docs/changes/2163.bug.rst
@@ -0,0 +1,2 @@
+Fix for ``TableLoader`` having the wrong data types for ``obs_id``,
+``event_id`` and ``tel_id``.
diff --git a/docs/changes/2171.bug.rst b/docs/changes/2171.bug.rst
new file mode 100644
index 00000000000..6d1e679c7bb
--- /dev/null
+++ b/docs/changes/2171.bug.rst
@@ -0,0 +1 @@
+Fix ``Tool`` printing a large traceback in case of certain configuration errors.
diff --git a/docs/changes/2173.bug.rst b/docs/changes/2173.bug.rst
new file mode 100644
index 00000000000..2814e6a678c
--- /dev/null
+++ b/docs/changes/2173.bug.rst
@@ -0,0 +1,2 @@
+The string representation of ``Field`` now sets numpy print options
+to prevent large arrays in the docstrings of ``Container`` classes.