teareduce 0.2.4__tar.gz → 0.3.0__tar.gz

{teareduce-0.2.4/src/teareduce.egg-info → teareduce-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: teareduce
-Version: 0.2.4
+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.4 → teareduce-0.3.0}/src/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-0.3.0/src/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-0.2.4 → teareduce-0.3.0}/src/teareduce/sdistortion.py

@@ -12,7 +12,7 @@ import matplotlib.pyplot as plt
 import numpy as np
 from numpy.polynomial import Polynomial
 from scipy import ndimage
-from tqdm import tqdm
+from tqdm.notebook import tqdm
 
 from .imshow import imshow
 from .polfit import polfit_residuals_with_sigma_rejection
@@ -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-0.2.4 → teareduce-0.3.0}/src/teareduce/statsummary.py

@@ -10,7 +10,7 @@
 from astropy.io import fits
 import numpy as np
 from pathlib import Path
-from tqdm import tqdm
+from tqdm.notebook import tqdm
 
 from .robust_std import robust_std
 from .sliceregion import SliceRegion2D

{teareduce-0.2.4 → teareduce-0.3.0}/src/teareduce/version.py

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

{teareduce-0.2.4 → teareduce-0.3.0}/src/teareduce/wavecal.py

@@ -19,7 +19,7 @@ import numpy as np
 from numpy.polynomial import Polynomial
 from pathlib import Path
 from scipy.ndimage import gaussian_filter1d
-from tqdm import tqdm
+from tqdm.notebook import tqdm
 
 from .ctext import ctext
 from .imshow import imshow

{teareduce-0.2.4 → teareduce-0.3.0/src/teareduce.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: teareduce
-Version: 0.2.4
+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.4 → teareduce-0.3.0}/src/teareduce.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 pyproject.toml
 src/teareduce/__init__.py
 src/teareduce/avoid_astropy_warnings.py
+src/teareduce/correct_pincushion_distortion.py
 src/teareduce/cosmicrays.py
 src/teareduce/ctext.py
 src/teareduce/draw_rectangle.py