Merge pull request #209 from jlaehne/hamamtsu-signal

Fix hamamatsu signal type
hyperspy · Nov 3, 2024 · 3fb0bfe · 3fb0bfe
2 parents 88923bf + e1f6458
commit 3fb0bfe
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/doc/user_guide/supported_formats/hamamatsu.rst b/doc/user_guide/supported_formats/hamamatsu.rst
@@ -5,18 +5,20 @@ Hamamatsu
 
 Reader for spectroscopy data saved in ``.img`` (ITEX) files from the HPD-TA
 (High Performance Digital Temporal Analyzer) or HiPic (High Performance image control)
-softwares from Hamamatsu, e.g. for streak cameras or high performance CCD cameras.
+softwares from Hamamatsu, e.g. for images from streak cameras or high performance
+CCD cameras.
 
-If `LumiSpy <https://lumispy.org>`_ is installed, ``Luminescence`` will be
-used as the ``signal_type``.
+If `LumiSpy <https://lumispy.org>`_ is installed, ``LumiTransientSpectrum`` will be
+used as the ``signal_type``, which is intended for streak camera images with
+both wavelength and time axes.
 
 .. Note::
 
-   Reading files containing multiple channels or multiple images per channel
-   is not implemented.
+   Currently, reading files containing multiple channels or multiple images per
+   channel is not implemented.
 
 API functions
 ^^^^^^^^^^^^^
 
 .. automodule:: rsciio.hamamatsu
-   :members:
+   :members:
diff --git a/rsciio/hamamatsu/_api.py b/rsciio/hamamatsu/_api.py
@@ -359,7 +359,7 @@ def _map_signal_md(self):
             )
             signal["signal_type"] = ""
         else:
-            signal["signal_type"] = "Luminescence"  # pragma: no cover
+            signal["signal_type"] = "LumiTransientSpectrum"  # pragma: no cover
 
         try:
             quantity = self.original_metadata["Comment"]["Acquisition"]["ZAxisLabel"]
@@ -497,7 +497,9 @@ def map_metadata(self):
 
 def file_reader(filename, lazy=False, use_uniform_signal_axes=False, **kwds):
     """
-    Read Hamamatsu's ``.img`` file.
+    Read Hamamatsu's ``.img`` file, e.g. for streak camera images. In case
+    LumiSpy is installed, the signal type is automatically set to
+    ``LumiTransientSpectrum``.
 
     Parameters
     ----------

diff --git a/upcoming_changes/209.bugfix.rst b/upcoming_changes/209.bugfix.rst
@@ -0,0 +1 @@
+Set ``signal_type`` to ``LumiTransientSpectrum`` when Hamamatsu ``.img`` files are read and LumiSpy is installed.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Set ``signal_type`` to ``LumiTransientSpectrum`` when Hamamatsu ``.img`` files are read and LumiSpy is installed.