teareduce 0.5.8__py3-none-any.whl → 0.5.9__py3-none-any.whl

teareduce/cleanest/__init__.py

@@ -7,6 +7,13 @@
 # License-Filename: LICENSE.txt
 #
 
+"""Module providing functions for cleaning astronomical images.
+Includes functions for interpolating over bad pixels, 
+applying the L.A.Cosmic algorithm to detect cosmic ray pixels.
+"""
+
 from .interpolate import interpolate
 from .lacosmicpad import lacosmicpad
-from .mergemasks import merge_peak_tail_masks
+from .mergemasks import merge_peak_tail_masks
+
+__all__ = ['interpolate', 'lacosmicpad', 'merge_peak_tail_masks']

teareduce/cleanest/__main__.py

@@ -10,7 +10,6 @@
 """Interactive Cosmic Ray cleaning tool."""
 
 import argparse
-from ast import arg
 import tkinter as tk
 from tkinter import filedialog
 from tkinter import simpledialog

teareduce/cleanest/cosmicraycleanerapp.py

@@ -17,7 +17,14 @@ from tkinter import simpledialog
 import sys
 
 from astropy.io import fits
-from maskfill import maskfill
+try:
+    from maskfill import maskfill
+except ModuleNotFoundError as e:
+    raise ModuleNotFoundError(
+        "The 'teareduce.cleanest' module requires the 'ccdproc' and 'maskfill' packages. "
+        "Please install teareduce with the 'cleanest' extra dependencies: "
+        "`pip install teareduce[cleanest]`."
+    ) from e
 import matplotlib.pyplot as plt
 from matplotlib.backend_bases import key_press_handler
 from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2Tk

teareduce/cleanest/lacosmicpad.py

@@ -9,7 +9,14 @@
 
 """Execute LACosmic algorithm on a padded image."""
 
-from ccdproc import cosmicray_lacosmic
+try:
+    from ccdproc import cosmicray_lacosmic
+except ModuleNotFoundError as e:
+    raise ModuleNotFoundError(
+        "The 'teareduce.cleanest' module requires the 'ccdproc' and 'maskfill' packages. "
+        "Please install teareduce with the 'cleanest' extra dependencies: "
+        "`pip install teareduce[cleanest]`."
+    ) from e
 import numpy as np
 
 

teareduce/cleanest/reviewcosmicray.py

@@ -13,7 +13,14 @@ import tkinter as tk
 from tkinter import messagebox
 from tkinter import simpledialog
 
-from maskfill import maskfill
+try:
+    from maskfill import maskfill
+except ModuleNotFoundError as e:
+    raise ModuleNotFoundError(
+        "The 'teareduce.cleanest' module requires the 'ccdproc' and 'maskfill' packages. "
+        "Please install teareduce with the 'cleanest' extra dependencies: "
+        "`pip install teareduce[cleanest]`."
+    ) from e
 import matplotlib.pyplot as plt
 from matplotlib.backend_bases import key_press_handler
 from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2Tk
@@ -371,16 +378,9 @@ class ReviewCosmicRay(ImageDisplay):
 
     def set_buttons_after_cleaning_cr(self):
         """Set the state of buttons after cleaning a cosmic ray."""
+        self.disable_interpolation_buttons()
         self.restore_cr_button.config(state=tk.NORMAL)
         self.remove_crosses_button.config(state=tk.DISABLED)
-        self.interp_x_button.config(state=tk.DISABLED)
-        self.interp_y_button.config(state=tk.DISABLED)
-        self.interp_s_button.config(state=tk.DISABLED)
-        self.interp_d_button.config(state=tk.DISABLED)
-        self.interp_m_button.config(state=tk.DISABLED)
-        self.interp_l_button.config(state=tk.DISABLED)
-        self.interp_maskfill_button.config(state=tk.DISABLED)
-        self.interp_aux_button.config(state=tk.DISABLED)
 
     def interp_x(self):
         """Perform x-direction interpolation to clean a cosmic ray."""
@@ -506,35 +506,21 @@ class ReviewCosmicRay(ImageDisplay):
         for iy, ix in zip(ycr_list, xcr_list):
             self.cr_labels[iy, ix] = 0
         print(f"Removed all pixels of cosmic ray {self.cr_index}")
-        self.remove_crosses_button.config(state=tk.DISABLED)
-        self.interp_x_button.config(state=tk.DISABLED)
-        self.interp_y_button.config(state=tk.DISABLED)
-        self.interp_s_button.config(state=tk.DISABLED)
-        self.interp_d_button.config(state=tk.DISABLED)
-        self.interp_m_button.config(state=tk.DISABLED)
-        self.interp_l_button.config(state=tk.DISABLED)
-        self.interp_aux_button.config(state=tk.DISABLED)
+        self.disable_interpolation_buttons()
         self.update_display()
 
     def restore_cr(self):
         """Restore all pixels of the current cosmic ray to their original values."""
         ycr_list, xcr_list = np.where(self.cr_labels == self.cr_index)
+        if len(xcr_list) == 0:
+            print(f"No pixels to restore for cosmic ray {self.cr_index}")
+            return
         for iy, ix in zip(ycr_list, xcr_list):
             self.data[iy, ix] = self.data_original[iy, ix]
             self.mask_fixed[iy, ix] = False
-            self.interp_x_button.config(state=tk.NORMAL)
-            self.interp_y_button.config(state=tk.NORMAL)
-            self.interp_s_button.config(state=tk.NORMAL)
-            self.interp_d_button.config(state=tk.NORMAL)
-            self.interp_m_button.config(state=tk.NORMAL)
-            if self.cleandata_lacosmic is not None:
-                if self.last_dilation is None or self.last_dilation == 0:
-                    self.interp_l_button.config(state=tk.NORMAL)
-            self.interp_maskfill_button.config(state=tk.NORMAL)
-            if self.auxdata is not None:
-                self.interp_aux_button.config(state=tk.NORMAL)
         print(f"Restored all pixels of cosmic ray {self.cr_index}")
         self.num_cr_cleaned -= 1
+        self.enable_interpolation_buttons()
         self.remove_crosses_button.config(state=tk.NORMAL)
         self.restore_cr_button.config(state=tk.DISABLED)
         self.update_display()
@@ -550,16 +536,7 @@ class ReviewCosmicRay(ImageDisplay):
             return  # important: do not remove (to avoid errors)
         self.first_plot = True
         self.restore_cr_button.config(state=tk.DISABLED)
-        self.interp_x_button.config(state=tk.NORMAL)
-        self.interp_y_button.config(state=tk.NORMAL)
-        self.interp_s_button.config(state=tk.NORMAL)
-        self.interp_d_button.config(state=tk.NORMAL)
-        self.interp_m_button.config(state=tk.NORMAL)
-        if self.cleandata_lacosmic is not None:
-            if self.last_dilation is None or self.last_dilation == 0:
-                self.interp_l_button.config(state=tk.NORMAL)
-        if self.auxdata is not None:
-            self.interp_aux_button.config(state=tk.NORMAL)
+        self.enable_interpolation_buttons()
         self.remove_crosses_button.config(state=tk.NORMAL)
         self.update_display()
 
@@ -624,25 +601,35 @@ class ReviewCosmicRay(ImageDisplay):
                 print(f"Pixel ({ix+1}, {iy+1}), with signal {self.data[iy, ix]}, marked as cosmic ray.")
             xcr_list, ycr_list = np.where(self.cr_labels == self.cr_index)
             if len(xcr_list) == 0:
-                self.interp_x_button.config(state=tk.DISABLED)
-                self.interp_y_button.config(state=tk.DISABLED)
-                self.interp_s_button.config(state=tk.DISABLED)
-                self.interp_d_button.config(state=tk.DISABLED)
-                self.interp_m_button.config(state=tk.DISABLED)
-                self.interp_l_button.config(state=tk.DISABLED)
-                self.interp_aux_button.config(state=tk.DISABLED)
+                self.disable_interpolation_buttons()
                 self.remove_crosses_button.config(state=tk.DISABLED)
             else:
-                self.interp_x_button.config(state=tk.NORMAL)
-                self.interp_y_button.config(state=tk.NORMAL)
-                self.interp_s_button.config(state=tk.NORMAL)
-                self.interp_d_button.config(state=tk.NORMAL)
-                self.interp_m_button.config(state=tk.NORMAL)
-                if self.cleandata_lacosmic is not None:
-                    if self.last_dilation is None or self.last_dilation == 0:
-                        self.interp_l_button.config(state=tk.NORMAL)
-                if self.auxdata is not None:
-                    self.interp_aux_button.config(state=tk.NORMAL)
+                self.enable_interpolation_buttons()
                 self.remove_crosses_button.config(state=tk.NORMAL)
             # Update the display to reflect the change
             self.update_display()
+
+    def disable_interpolation_buttons(self):
+        """Disable all interpolation buttons."""
+        self.interp_x_button.config(state=tk.DISABLED)
+        self.interp_y_button.config(state=tk.DISABLED)
+        self.interp_s_button.config(state=tk.DISABLED)
+        self.interp_d_button.config(state=tk.DISABLED)
+        self.interp_m_button.config(state=tk.DISABLED)
+        self.interp_l_button.config(state=tk.DISABLED)
+        self.interp_maskfill_button.config(state=tk.DISABLED)
+        self.interp_aux_button.config(state=tk.DISABLED)
+
+    def enable_interpolation_buttons(self):
+        """Enable all interpolation buttons."""
+        self.interp_x_button.config(state=tk.NORMAL)
+        self.interp_y_button.config(state=tk.NORMAL)
+        self.interp_s_button.config(state=tk.NORMAL)
+        self.interp_d_button.config(state=tk.NORMAL)
+        self.interp_m_button.config(state=tk.NORMAL)
+        if self.cleandata_lacosmic is not None:
+             if self.last_dilation is None or self.last_dilation == 0:
+                 self.interp_l_button.config(state=tk.NORMAL)
+        self.interp_maskfill_button.config(state=tk.NORMAL)
+        if self.auxdata is not None:
+            self.interp_aux_button.config(state=tk.NORMAL)

teareduce/version.py

@@ -9,7 +9,7 @@
 #
 """Module to define the version of the teareduce package."""
 
-VERSION = '0.5.8'
+VERSION = '0.5.9'
 
 
 def main():

{teareduce-0.5.8.dist-info → teareduce-0.5.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: teareduce
-Version: 0.5.8
+Version: 0.5.9
 Summary: Utilities for astronomical data reduction
 Author-email: Nicolás Cardiel <cardiel@ucm.es>
 License: GPL-3.0-or-later
@@ -20,16 +20,17 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: astropy
-Requires-Dist: ccdproc
 Requires-Dist: lmfit
 Requires-Dist: matplotlib
-Requires-Dist: maskfill
-Requires-Dist: numpy>=1.22
+Requires-Dist: numpy>=2
 Requires-Dist: requests
 Requires-Dist: rich
 Requires-Dist: rich-argparse
 Requires-Dist: scipy
 Requires-Dist: tqdm
+Provides-Extra: cleanest
+Requires-Dist: ccdproc; extra == "cleanest"
+Requires-Dist: maskfill; extra == "cleanest"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Dynamic: license-file
@@ -67,6 +68,13 @@ $ . venv_teareduce/bin/activate
 (venv_teareduce) $ 
 ```
 
+If you are planning to use **tea-cleanest**, you need to install this package
+with extra dependencies. In this case employ:
+
+```shell
+(venv_teareduce) $ pip install 'teareduce[cleanest]'
+```
+
 ### Installing the package
 
 The latest stable version is available via de [PyPI repository](https://pypi.org/project/teareduce/):
@@ -94,6 +102,10 @@ The latest development version is available through [GitHub](https://github.com/
 (venv_teareduce) $ ipython
 In [1]: import teareduce as tea
 In [2]: print(tea.__version__)
-0.4.3
+0.5.9
 ```
 
+Note that in PyPI there is a package called **tea** that provides utilities
+unrelated to **teareduce**. However, throughout the examples described
+in the documentation we are making use of ``import teareduce as tea``
+to define a convenient alias.

{teareduce-0.5.8.dist-info → teareduce-0.5.9.dist-info}/RECORD

@@ -15,14 +15,14 @@ teareduce/sdistortion.py,sha256=5ZsZn4vD5Sw2aoqO8-NIOH7H89Zmh7ZDkow6YbAotHU,5916
 teareduce/simulateccdexposure.py,sha256=cdbpca6GVuM3d7R1LGzlIZZvjTq_jzrlkk_Cli7aouQ,24636
 teareduce/sliceregion.py,sha256=Jdf8XvmGaY_vaY1cneTaRtSOYPxpUsJm9cXJDDMa0YM,18626
 teareduce/statsummary.py,sha256=VTNAnBV8z6suqiyB2Lhw3YjUUOjlmwUPX3enkOKRF54,5422
-teareduce/version.py,sha256=G40b1Oo_cwqV4sHca8L26xY3VpGjlKvOFDTnZdytrtg,419
+teareduce/version.py,sha256=Tab2zphBGQslnQsUawX1hJaJWEF6qYbHq13JXc12qms,419
 teareduce/wavecal.py,sha256=2MewWz5Y3ms41c305UtWOM_LaLNdk1mugDXCtzf-fSw,68586
 teareduce/write_array_to_fits.py,sha256=kWDrEH9coJ1yIu56oQJpWtDqJL4c8HGmssE9jle4e94,617
 teareduce/zscale.py,sha256=SDgmcDD2N5GvDn46JADCgTQJPBF_N_jSKMHoeTz9Nsw,1152
-teareduce/cleanest/__init__.py,sha256=hHFtV6uBx6HAI8LFUDli0urznTUzMotCW9J_4EKGCXc,293
-teareduce/cleanest/__main__.py,sha256=cMzvNWNe2fuTGHLtT3hOc9-NAcMXDZUqHN0SSHWWDnc,5977
+teareduce/cleanest/__init__.py,sha256=NEJ7JETeZFaKl8yW9gjLHIwfkI3F3B0TWQeCY3ESSrk,548
+teareduce/cleanest/__main__.py,sha256=muijsFmB4kd0E5fn5ZhRHUH2bIPSRgykEUq3yg0K05c,5957
 teareduce/cleanest/centerchildparent.py,sha256=wHxOvNrrQ-KBLZAbtQ9bJAxYhGOzqYBF4LgdIQk7UF8,1285
-teareduce/cleanest/cosmicraycleanerapp.py,sha256=gugC79tdQFhT7plOWKqm5uTtjJCiWIeDpNmaCiE7aA4,50584
+teareduce/cleanest/cosmicraycleanerapp.py,sha256=5z3tjfhoOQox3_NHi1oH2SudgPM_EjqMtz9nw6BKyqk,50882
 teareduce/cleanest/definitions.py,sha256=L7VXT0SAjv96zgZ_VhMMV1vcf-oxdwefvlmPclBA-ug,2558
 teareduce/cleanest/dilatemask.py,sha256=I5tHAv5VEO6V0Wed8Ar20uLt4F9P-tgjmLL5BAaFvgM,1276
 teareduce/cleanest/find_closest_true.py,sha256=mWdIvhipzAXDRKfePDrP7f0lP4U48cckpHiKwiB4jHI,1320
@@ -32,20 +32,20 @@ teareduce/cleanest/interpolation_a.py,sha256=zE4VIrC41vapf0Vx9qmh1oacw2qkJwcuMnV
 teareduce/cleanest/interpolation_x.py,sha256=D5hKbobT6lJk18XktP3PXhzEN12zqed6U18yfQ-reLQ,3744
 teareduce/cleanest/interpolation_y.py,sha256=O6yw5nKKlTdV6qsP1Ku6CwGhXB6o3j0_YQirXyILi8c,3759
 teareduce/cleanest/interpolationeditor.py,sha256=J5vrioLTwUSMbUeY0ezqNqm3CvLJgKFe7gvZ44Z62sc,13257
-teareduce/cleanest/lacosmicpad.py,sha256=xWaxifoF_B82Gm5czuJmL7Y4Cv0W___LlvcpH633bAo,2047
+teareduce/cleanest/lacosmicpad.py,sha256=K_SU2YBds9I3eN0vJLkrbTLcdRpB2bMRf90_3Rk5ZIk,2345
 teareduce/cleanest/mergemasks.py,sha256=1Vq6Wqn6DClxSAvHwy6QrJGszA8nkmoMHITyprSykHI,2072
 teareduce/cleanest/modalprogressbar.py,sha256=uwd-p92PvOVJnbXd-B8DRcBZ--keKpr4ZN9PLeqm1Ws,6449
 teareduce/cleanest/parametereditor.py,sha256=_0baFbkIUcPyF-teFIRMt1MpA4IzDZc7VHNh1h0qN4A,14229
-teareduce/cleanest/reviewcosmicray.py,sha256=yTY9vNyYSuh_AZsIJAEtJ50mgIKhjgTe-LQob4xQx9U,29497
+teareduce/cleanest/reviewcosmicray.py,sha256=QQaGMl_P9uWYBmDlPFIw7vEg_TI5DUJUhzBMdIShHC0,28297
 teareduce/cookbook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 teareduce/cookbook/get_cookbook_file.py,sha256=vde-iNii2lm1QII8GmLRsFsKNxkdsd7njCBE-8Z7io0,1088
 teareduce/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 teareduce/tests/test_cleanest.py,sha256=6dRqkw1RQMKsFrC8cEweMvTD6wXhiDv3P4PS57-HEqI,5598
 teareduce/tests/test_sliceregion.py,sha256=S7Zoh2eEBFIEbfsXgWBEMCf7pottjw2oLhqlZJQkAwg,3785
 teareduce/tests/test_version.py,sha256=mKLnbXyvVNc1pATq5PxR8qeoFMPAFL_GilFV6IHLOi0,172
-teareduce-0.5.8.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-teareduce-0.5.8.dist-info/METADATA,sha256=Xm0x4wiGEoHvS_3tIk7gmaLHZbN0HDuN_Iec_wdQg84,3137
-teareduce-0.5.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-teareduce-0.5.8.dist-info/entry_points.txt,sha256=6yBvig5jTL2ugqz5SF767AiszzrHKGRASsX1II84kqA,66
-teareduce-0.5.8.dist-info/top_level.txt,sha256=7OkwtX9zNRkGJ7ACgjk4ESgC74qUYcS5O2qcO0v-Si4,10
-teareduce-0.5.8.dist-info/RECORD,,
+teareduce-0.5.9.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+teareduce-0.5.9.dist-info/METADATA,sha256=lk-aBMRThZ2tRIPajrP6yKD40TIow1WgzJ56ymTcOjU,3640
+teareduce-0.5.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+teareduce-0.5.9.dist-info/entry_points.txt,sha256=6yBvig5jTL2ugqz5SF767AiszzrHKGRASsX1II84kqA,66
+teareduce-0.5.9.dist-info/top_level.txt,sha256=7OkwtX9zNRkGJ7ACgjk4ESgC74qUYcS5O2qcO0v-Si4,10
+teareduce-0.5.9.dist-info/RECORD,,