teareduce 0.2.5__py3-none-any.whl → 0.3.0__py3-none-any.whl

teareduce/__init__.py

@@ -8,6 +8,7 @@
 #
 
 from .avoid_astropy_warnings import avoid_astropy_warnings
+from .correct_pincushion_distortion import correct_pincushion_distortion
 from .cosmicrays import cr2images, apply_cr2images_ccddata, crmedian
 from .ctext import ctext
 from .draw_rectangle import draw_rectangle

teareduce/correct_pincushion_distortion.py

@@ -0,0 +1,60 @@
+#
+# Copyright 2024 Universidad Complutense de Madrid
+#
+# This file is part of teareduce
+#
+# SPDX-License-Identifier: GPL-3.0+
+# License-Filename: LICENSE.txt
+#
+
+from astropy.io import fits
+import numpy as np
+from numpy.polynomial import Polynomial
+
+
+def correct_pincushion_distortion(coeff_filename, data):
+    """Correct pincushion distortion.
+
+    Parameters
+    ----------
+    coeff_filename : str
+        Name of the FITS file containing the polynomial coefficients
+        of the transformation between the Y-coordinates of the central
+        image column and the measured Y-coordinates (for each image
+        column).
+    data : `~numpy.ndarray`
+        Array containing the image to be corrected.
+
+    Returns
+    -------
+    data_rectified : `~numpy.ndarray`
+        Rectified image.
+    """
+
+    # read FITS file with polynomial coefficients
+
+    with fits.open(coeff_filename) as hdul:
+        table = hdul[1].data
+
+    # check dimensions
+    naxis2, naxis1 = data.shape
+    if naxis1 != len(table):
+        raise ValueError(f'Incompatible dimensions: naxis1:{naxis1} != len(table): {len(table)}')
+
+    # rectify image
+    accum_flux = np.zeros((naxis2 + 1, naxis1))
+    accum_flux[1:, :] = np.cumsum(data, axis=0)
+    new_y_borders = np.arange(naxis2 + 1) - 0.5
+    data_rectified = np.zeros((naxis2, naxis1))
+    for i in range(naxis1):
+        poly = Polynomial(coef=table[i])
+        flux_borders = np.interp(
+            x=new_y_borders,
+            xp=poly(new_y_borders),
+            fp=accum_flux[:, i],
+            left=0,
+            right=accum_flux[-1, i]
+        )
+        data_rectified[:, i] = flux_borders[1:] - flux_borders[:-1]
+
+    return data_rectified

teareduce/sdistortion.py

@@ -54,6 +54,8 @@ def fit_sdistortion(data, ns_min, ns_max, nc_min, nc_max,
     -------
     data_straight : numpy array
         2D spectroscopic image corrected from S distortion.
+    poly_funct_peaks : `~numpy.polynomial.polynomial.Polynomial`
+        Fitted polynomial.
 
     """
 
@@ -177,4 +179,4 @@ def fit_sdistortion(data, ns_min, ns_max, nc_min, nc_max,
         plt.show()
 
     # return result
-    return data_straight
+    return data_straight, poly_funct_peaks

teareduce/version.py

@@ -8,7 +8,7 @@
 # License-Filename: LICENSE.txt
 #
 
-version = '0.2.5'
+version = '0.3.0'
 
 
 def main():

{teareduce-0.2.5.dist-info → teareduce-0.3.0.dist-info}/METADATA

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

{teareduce-0.2.5.dist-info → teareduce-0.3.0.dist-info}/RECORD

@@ -1,5 +1,6 @@
-teareduce/__init__.py,sha256=NVBoSQQ4L2yeGSde9ZSowcSimYq2aFIaLWkIEMzRZdI,909
+teareduce/__init__.py,sha256=kAUSGwgPx3jjWFxHz_Nd1axOGv6tug6utent6WB2tQ4,982
 teareduce/avoid_astropy_warnings.py,sha256=2YgQ47pxsKYWDxUtzyEOfh3Is3aAHHmjJkuOa1JCDN4,648
+teareduce/correct_pincushion_distortion.py,sha256=Xpt03jtmJMyqik4ta95zMRE3Z6dVfzzHI2z5IDbtnMk,1685
 teareduce/cosmicrays.py,sha256=y8f5KLUsiOeOkArGnZVi_q11chsgnYlwtxbSD_a9EAQ,24209
 teareduce/ctext.py,sha256=8QP_KW7ueJ34IUyduVpy7nk-x0If5eilawf87icDMJA,2084
 teareduce/draw_rectangle.py,sha256=xlwcKIkl7e0U6sa9zWZr8t_WuWAte_UKIqCwZQ41x4Q,1922
@@ -8,14 +9,14 @@ teareduce/imshow.py,sha256=PbQiOGjr3uKk7gkQDjIl5VLMxcGu7Ezu4rEs-oMysiM,3852
 teareduce/peaks_spectrum.py,sha256=YPCJz8skJmIjWYqT7ZhBJGhnqPayFwy5xb7I9OHlUZI,9890
 teareduce/polfit.py,sha256=CGsrRsz_Du2aKxOcgXi36lpAZO04JyqCCUaxhC0C-Mk,14281
 teareduce/robust_std.py,sha256=dk1G3VgiplZzmSfL7qWniEZ-5c3novHnBpRPCM77u84,1084
-teareduce/sdistortion.py,sha256=uGz_LSEGlTLB5m_MzE7GRvu-BwzQxbPiFrr0OWWXDVY,5806
+teareduce/sdistortion.py,sha256=5ZsZn4vD5Sw2aoqO8-NIOH7H89Zmh7ZDkow6YbAotHU,5916
 teareduce/sliceregion.py,sha256=ACMfl5jDL0Bw2fnhZBzhvyDRiI7RoD5ut-xZ8sgnz8Q,5104
 teareduce/statsummary.py,sha256=mtaM21d5aHvtLjCt_SSDMvD_fjI5nK21ZqxuDtcvldI,5426
-teareduce/version.py,sha256=yjIBjM08UpfJ9I_cr0DQb8IqdCEHktVpqJ97BYudqag,303
+teareduce/version.py,sha256=lGfmM62wUELqVGMKXx5GeQkRf5tGpuhjbZ_xEp5S5pI,303
 teareduce/wavecal.py,sha256=iiKG_RPW2CllwZxG5fTsyckE0Ec_IeZ6v7v2cQt6OeU,68706
 teareduce/zscale.py,sha256=HuPYagTW55D7RtjPGc7HcibQlCx5oqLYHKoM6WEHG2g,1161
-teareduce-0.2.5.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-teareduce-0.2.5.dist-info/METADATA,sha256=ouUdTEEI75npkM3X_gTmXVs71NBbarV7D6nwOMRwRvM,2283
-teareduce-0.2.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-teareduce-0.2.5.dist-info/top_level.txt,sha256=7OkwtX9zNRkGJ7ACgjk4ESgC74qUYcS5O2qcO0v-Si4,10
-teareduce-0.2.5.dist-info/RECORD,,
+teareduce-0.3.0.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+teareduce-0.3.0.dist-info/METADATA,sha256=DxNiP1qngg725QTdznJf0nOazd63V2i77SeVlnWdDo0,2283
+teareduce-0.3.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+teareduce-0.3.0.dist-info/top_level.txt,sha256=7OkwtX9zNRkGJ7ACgjk4ESgC74qUYcS5O2qcO0v-Si4,10
+teareduce-0.3.0.dist-info/RECORD,,