teareduce 0.3.5__tar.gz → 0.4.0__tar.gz

{teareduce-0.3.5/src/teareduce.egg-info → teareduce-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: teareduce
-Version: 0.3.5
+Version: 0.4.0
 Summary: Utilities for astronomical data reduction
 Author-email: Nicolás Cardiel <cardiel@ucm.es>
 License: GPL-3.0-or-later

{teareduce-0.3.5 → teareduce-0.4.0}/src/teareduce/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2023-2024 Universidad Complutense de Madrid
+# Copyright 2023-2025 Universidad Complutense de Madrid
 #
 # This file is part of teareduce
 #
@@ -13,7 +13,9 @@ from .cosmicrays import cr2images, apply_cr2images_ccddata, crmedian
 from .ctext import ctext
 from .draw_rectangle import draw_rectangle
 from .elapsed_time import elapsed_time
+from .elapsed_time import elapsed_time_since
 from .imshow import imshow
+from .imshow import imshowme
 from .numsplines import AdaptiveLSQUnivariateSpline
 from .peaks_spectrum import find_peaks_spectrum, refine_peaks_spectrum
 from .polfit import polfit_residuals, polfit_residuals_with_sigma_rejection
@@ -21,8 +23,10 @@ from .robust_std import robust_std
 from .sdistortion import fit_sdistortion
 from .sliceregion import SliceRegion1D, SliceRegion2D
 from .statsummary import ifc_statsummary, statsummary
+from .simulateccdexposure import SimulateCCDExposure
 from .version import version
 from .wavecal import TeaWaveCalibration, apply_wavecal_ccddata
+from .write_array_to_fits import write_array_to_fits
 from .zscale import zscale
 
 __version__ = version

{teareduce-0.3.5 → teareduce-0.4.0}/src/teareduce/elapsed_time.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2024 Universidad Complutense de Madrid
+# Copyright 2024-2025 Universidad Complutense de Madrid
 #
 # This file is part of teareduce
 #
@@ -8,6 +8,7 @@
 # License-Filename: LICENSE.txt
 #
 
+from datetime import datetime
 import platform
 import sys
 from .version import version
@@ -39,3 +40,18 @@ def elapsed_time(time_ini, time_end, osinfo=True):
     print(f"Initial time.....: {time_ini}")
     print(f"Final time.......: {time_end}")
     print(f"Elapsed time.....: {time_end - time_ini}")
+
+
+def elapsed_time_since(time_ini, osinfo=True):
+    """Display elapsed time and OS info since a given time.
+
+    Parameters
+    ----------
+    time_ini : datetime instance
+        Initial time.
+    osinfo : bool
+        If True, display OS info.
+    """
+
+    time_end = datetime.now()
+    elapsed_time(time_ini, time_end)

{teareduce-0.3.5 → teareduce-0.4.0}/src/teareduce/imshow.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2022-2024 Universidad Complutense de Madrid
+# Copyright 2022-2025 Universidad Complutense de Madrid
 #
 # This file is part of teareduce
 #
@@ -7,12 +7,37 @@
 # License-Filename: LICENSE.txt
 #
 
-import astropy.units as u
+from astropy.units import Unit
+from matplotlib import pyplot as plt
+from matplotlib.figure import Figure
+from matplotlib.axes import Axes
 from mpl_toolkits.axes_grid1 import make_axes_locatable
 
 
+def imshowme(data, **kwargs):
+    """Simple execution of teareduce.imshow.
+
+    Parameters
+    ----------
+    data : numpy.ndarray
+        2D array to be displayed
+
+    Returns
+    -------
+    fig : matplotlib.figure.Figure
+        Instance of Figure.
+    ax : matplotlib.axes.Axes
+        Instance of Axes.
+    img : matplotlib AxesImage
+        Instance returned by ax.imshow()
+    """
+    fig, ax = plt.subplots()
+    img = imshow(fig=fig, ax=ax, data=data, **kwargs)
+    return fig, ax, img
+
+
 def imshow(fig=None, ax=None, data=None,
-           crpix1=1, crval1=None, cdelt1=None, cunit1=None, cunitx=u.Angstrom,
+           crpix1=1, crval1=None, cdelt1=None, cunit1=None, cunitx=Unit('Angstrom'),
            xlabel=None, ylabel=None, title=None,
            colorbar=True, cblabel='Number of counts',
            **kwargs):
@@ -25,9 +50,9 @@ def imshow(fig=None, ax=None, data=None,
     Parameters
     ----------
     fig : matplotlib.figure.Figure
-        Figure object.
+        Instance of Figure.
     ax : matplotlib.axes.Axes
-        Axes object.
+        Instance of Axes.
     data : numpy array
         2D array to be displayed.
     crpix1 : astropy.units.Quantity
@@ -63,6 +88,13 @@ def imshow(fig=None, ax=None, data=None,
 
     """
 
+    # protections
+    if not isinstance(fig, Figure):
+        raise ValueError("Unexpected 'fig' argument")
+    if not isinstance(ax, Axes):
+        raise ValueError("Unexpected 'ax' argument")
+
+    # default labels
     if xlabel is None:
         xlabel = 'X axis (array index)'
 
@@ -77,13 +109,18 @@ def imshow(fig=None, ax=None, data=None,
         naxis2, naxis1 = data.shape
         xmin, xmax = -0.5, naxis1 - 0.5
         ymin, ymax = -0.5, naxis2 - 0.5
-        xminwv = crval1 + (xmin * u.pixel - crpix1 + 1 * u.pixel) * cdelt1
-        xmaxwv = crval1 + (xmax * u.pixel - crpix1 + 1 * u.pixel) * cdelt1
+        u_pixel = Unit('pixel')
+        xminwv = crval1 + (xmin * u_pixel - crpix1 + 1 * u_pixel) * cdelt1
+        xmaxwv = crval1 + (xmax * u_pixel - crpix1 + 1 * u_pixel) * cdelt1
         extent = [xminwv.to(cunitx).value, xmaxwv.to(cunitx).value, ymin, ymax]
         xlabel = f'Wavelength ({cunitx})'
         aspect = 'auto'
     else:
-        extent = None
+        if 'extent' in kwargs:
+            extent = kwargs['extent']
+            del kwargs['extent']
+        else:
+            extent = None
         if 'aspect' in kwargs:
             aspect = kwargs['aspect']
             del kwargs['aspect']
@@ -110,3 +147,5 @@ def imshow(fig=None, ax=None, data=None,
         divider = make_axes_locatable(ax)
         cax = divider.append_axes("right", size="5%", pad=0.05)
         fig.colorbar(img, cax=cax, label=cblabel)
+
+    return img