teareduce 0.6.6__py3-none-any.whl → 0.6.7__py3-none-any.whl

teareduce/cleanest/cosmicraycleanerapp.py

@@ -372,9 +372,9 @@ class CosmicRayCleanerApp(ImageDisplay):
         # --- DeepCR button
         self.run_deepcr_button = tkbutton.new(
             self.button_frame1,
-            text="Run DeepCR",
+            text="Run deepCR",
             command=self.run_deepcr,
-            help_text="Run the DeepCR algorithm to detect cosmic rays in the image.",
+            help_text="Run the deepCR algorithm to detect cosmic rays in the image.",
         )
         self.run_deepcr_button.pack(side=tk.LEFT, padx=5)
         # --- Cosmic-CoNN button
@@ -677,7 +677,7 @@ class CosmicRayCleanerApp(ImageDisplay):
                         "Dilation", "Enter Dilation (min=0):", initialvalue=0, minvalue=0
                     )
                     self.process_detected_cr(dilation=dilation)
-                    self.cleandata_deepcr = None  # Invalidate previous DeepCR cleaned data
+                    self.cleandata_deepcr = None  # Invalidate previous deepCR cleaned data
                     self.cleandata_lacosmic = None  # Invalidate previous L.A.Cosmic cleaned data
                     self.cleandata_pycosmic = None  # Invalidate previous PyCosmic cleaned data
             except Exception as e:
@@ -1189,7 +1189,7 @@ class CosmicRayCleanerApp(ImageDisplay):
         self.save_crmask_button.config(state=tk.NORMAL)
 
     def run_deepcr(self):
-        """Run DeepCR to detect cosmic rays."""
+        """Run deepCR to detect cosmic rays."""
         if np.any(self.mask_crfound):
             overwrite = messagebox.askyesno(
                 "Overwrite Cosmic Ray Mask",
@@ -1198,23 +1198,23 @@ class CosmicRayCleanerApp(ImageDisplay):
             if not overwrite:
                 return
         self.run_deepcr_button.config(state=tk.DISABLED)
-        print("[bold green]Executing DeepCR...[/bold green]")
-        # Initialize the DeepCR model
+        print("[bold green]Executing deepCR...[/bold green]")
+        # Initialize the deepCR model
         mdl = deepCR.deepCR(mask=self.deepcr_params["mask"]["value"])
         # Ask for threshold value and update parameter
         threshold = simpledialog.askfloat(
             "Threshold",
-            "Enter DeepCR probability threshold (0.0 - 1.0):",
+            "Enter deepCR probability threshold (0.0 - 1.0):",
             initialvalue=self.deepcr_params["threshold"]["value"],
             minvalue=0.0,
             maxvalue=1.0,
         )
         if threshold is None:
-            print("Threshold input cancelled. DeepCR detection skipped!")
+            print("Threshold input cancelled. deepCR detection skipped!")
             self.run_deepcr_button.config(state=tk.NORMAL)
             return
         self.deepcr_params["threshold"]["value"] = threshold
-        print(f"Running DeepCR version: {deepCR.__version__}  (please wait...)", end="")
+        print(f"Running deepCR version: {deepCR.__version__}  (please wait...)", end="")
         self.mask_crfound, self.cleandata_deepcr = mdl.clean(
             self.data,
             threshold=self.deepcr_params["threshold"]["value"],
@@ -1224,16 +1224,16 @@ class CosmicRayCleanerApp(ImageDisplay):
         # Process the mask: dilation and labeling
         dilation = simpledialog.askinteger(
             "Dilation",
-            "Note: Applying dilation will prevent the use of the DeepCR cleaned data.\n\n" "Enter Dilation (min=0):",
+            "Note: Applying dilation will prevent the use of the deepCR cleaned data.\n\n" "Enter Dilation (min=0):",
             initialvalue=self.deepcr_params["dilation"]["value"],
             minvalue=0,
         )
         if dilation is None:
-            print("Dilation input cancelled. DeepCR detection skipped!")
+            print("Dilation input cancelled. deepCR detection skipped!")
             self.run_deepcr_button.config(state=tk.NORMAL)
             return
         if dilation > 0:
-            self.cleandata_deepcr = None  # Invalidate DeepCR cleaned data if dilation applied
+            self.cleandata_deepcr = None  # Invalidate deepCR cleaned data if dilation applied
         self.deepcr_params["dilation"]["value"] = dilation
         self.process_detected_cr(dilation=self.deepcr_params["dilation"]["value"])
         # Invalidate previous cleaned data from other methods

teareduce/cleanest/definitions.py

@@ -135,9 +135,9 @@ VALID_CLEANING_METHODS = {
     "surface interp.": "a-plane",
     "median": "a-median",
     "mean": "a-mean",
-    "lacosmic": "lacosmic",
-    "pycosmic": "pycosmic",
-    "deepcr": "deepcr",
+    "L.A.Cosmic": "lacosmic",
+    "PyCosmic": "pycosmic",
+    "deepCR": "deepcr",
     "maskfill": "maskfill",
     "auxdata": "auxdata",
 }

teareduce/cleanest/interpolationeditor.py

@@ -70,7 +70,7 @@ class InterpolationEditor:
         cleandata_pycosmic : array-like or None
             Cleaned data from PyCosmic, if available.
         cleandata_deepcr : array-like or None
-            Cleaned data from DeepCR, if available.
+            Cleaned data from deepCR, if available.
         xmin : float
             Minimum x value of the data. From 1 to NAXIS1.
         xmax : float
@@ -106,7 +106,7 @@ class InterpolationEditor:
         cleandata_pycosmic : array-like or None
             Cleaned data from PyCosmic, if available.
         cleandata_deepcr : array-like or None
-            Cleaned data from DeepCR, if available.
+            Cleaned data from deepCR, if available.
         dict_interp_methods : dict
             Mapping of interpolation method names to their codes.
         cleaning_method : str or None
@@ -182,17 +182,17 @@ class InterpolationEditor:
             state = "normal"
             # Skip replace by L.A.Cosmic values if last dilation is not zero
             # or cleandata_lacosmic is not available
-            if interp_method == "lacosmic":
+            if interp_method == "L.A.Cosmic":
                 if self.last_dilation != 0:
                     state = "disabled"
                 if self.cleandata_lacosmic is None:
                     state = "disabled"
             # Skip replace by PyCosmic values if cleandata_pycosmic is not available
-            elif interp_method == "pycosmic":
+            elif interp_method == "PyCosmic":
                 if self.cleandata_pycosmic is None:
                     state = "disabled"
-            # Skip replace by DeepCR values if cleandata_deepcr is not available
-            elif interp_method == "deepcr":
+            # Skip replace by deepCR values if cleandata_deepcr is not available
+            elif interp_method == "deepCR":
                 if self.cleandata_deepcr is None:
                     state = "disabled"
             # Skip auxdata method if auxdata is not available
@@ -475,7 +475,7 @@ class InterpolationEditor:
             self.entry_maskfill_operator.config(state="disabled")
             self.entry_maskfill_smooth.config(state="disabled")
             self.entry_maskfill_verbose.config(state="disabled")
-        elif selected_method in ["lacosmic", "pycosmic", "deepcr", "auxdata"]:
+        elif selected_method in ["L.A.Cosmic", "PyCosmic", "deepCR", "auxdata"]:
             self.entry_npoints.config(state="disabled")
             self.entry_degree.config(state="disabled")
             self.entry_maskfill_size.config(state="disabled")

teareduce/cleanest/reviewcosmicray.py

@@ -91,7 +91,7 @@ class ReviewCosmicRay(ImageDisplay):
         cleandata_pycosmic: 2D numpy array or None
             The cleaned image data from PyCosmic.
         cleandata_deepcr: 2D numpy array or None
-            The cleaned image data from DeepCR.
+            The cleaned image data from deepCR.
         cr_labels : 2D numpy array
             Labels of connected cosmic ray pixel groups.
         num_features : int
@@ -167,7 +167,7 @@ class ReviewCosmicRay(ImageDisplay):
         cleandata_pycosmic: 2D numpy array or None
             The cleaned image data from PyCosmic.
         cleandata_deepcr: 2D numpy array or None
-            The cleaned image data from DeepCR.
+            The cleaned image data from deepCR.
         cr_labels : 2D numpy array
             Labels of connected cosmic ray pixel groups.
         num_features : int
@@ -360,7 +360,7 @@ class ReviewCosmicRay(ImageDisplay):
         # --- Interpolation using L.A.Cosmic button
         self.interp_l_button = tkbutton.new(
             self.button_frame3,
-            text="[l]acosmic",
+            text="[L].A.Cosmic",
             command=self.use_lacosmic,
             help_text="Use L.A.Cosmic interpolation for the current cosmic ray.",
         )
@@ -384,7 +384,7 @@ class ReviewCosmicRay(ImageDisplay):
             self.button_frame3,
             text="deepCR",
             command=self.use_deepcr,
-            help_text="Use DeepCR interpolation for the current cosmic ray.",
+            help_text="Use deepCR interpolation for the current cosmic ray.",
         )
         self.interp_deepcr_button.pack(side=tk.LEFT, padx=5)
         if self.cleandata_deepcr is None:
@@ -745,11 +745,11 @@ class ReviewCosmicRay(ImageDisplay):
         self.update_display(cleaned=True)
     
     def use_deepcr(self):
-        """Use DeepCR cleaned data to clean a cosmic ray."""
+        """Use deepCR cleaned data to clean a cosmic ray."""
         if self.cleandata_deepcr is None:
-            print("DeepCR cleaned data not available.")
+            print("deepCR cleaned data not available.")
             return
-        print(f"DeepCR interpolation of cosmic ray {self.cr_index}")
+        print(f"deepCR interpolation of cosmic ray {self.cr_index}")
         ycr_list, xcr_list = np.where(self.cr_labels == self.cr_index)
         for iy, ix in zip(ycr_list, xcr_list):
             self.data[iy, ix] = self.cleandata_deepcr[iy, ix]

teareduce/version.py

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

{teareduce-0.6.6.dist-info → teareduce-0.6.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: teareduce
-Version: 0.6.6
+Version: 0.6.7
 Summary: Utilities for astronomical data reduction
 Author-email: Nicolás Cardiel <cardiel@ucm.es>
 License: GPL-3.0-or-later
@@ -39,7 +39,7 @@ Dynamic: license-file
 
 # teareduce
 
-[![Teareduce's PyPI version](https://badge.fury.io/py/teareduce.svg)](https://badge.fury.io/py/teareduce)
+[![Teareduce's PyPI version](https://badge.fury.io/py/teareduce.svg?kill_cache=1)](https://badge.fury.io/py/teareduce)
 
 Utilities for astronomical data reduction.
 
@@ -72,13 +72,6 @@ $ . 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/):
@@ -96,6 +89,20 @@ The latest development version is available through [GitHub](https://github.com/
 (venv_teareduce) $ pip install git+https://github.com/nicocardiel/teareduce.git@main#egg=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]'
+```
+
+In addition, in order to make use of the **PyCosmic** algorithm with
+`tea-cleanest`, you need to install that package. This can be done using:
+
+```shell
+(venv_teareduce) $ pip install git+https://github.com/nicocardiel/PyCosmic.git@test
+```
+
 ### Testing the installation
 
 ```shell
@@ -106,7 +113,7 @@ 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.5.9
+0.6.6
 ```
 
 Note that in PyPI there is a package called **tea** that provides utilities

{teareduce-0.6.6.dist-info → teareduce-0.6.7.dist-info}/RECORD

@@ -15,7 +15,7 @@ teareduce/sdistortion.py,sha256=z7GX7MMkWhexUJn4VqsSOXLNsZTSdoaCzl9ukW1XlaA,5912
 teareduce/simulateccdexposure.py,sha256=cdbpca6GVuM3d7R1LGzlIZZvjTq_jzrlkk_Cli7aouQ,24636
 teareduce/sliceregion.py,sha256=Jdf8XvmGaY_vaY1cneTaRtSOYPxpUsJm9cXJDDMa0YM,18626
 teareduce/statsummary.py,sha256=vtM0ZtKI1-uw6zZyNwDkBGDS_hOdBcFCtpMzdSrLwIw,5418
-teareduce/version.py,sha256=BmttN-OFIHBPLpMVvra9qYVBs5IgEuSYtkX_lx5o5Mg,419
+teareduce/version.py,sha256=8psShacK0WzaM79p4Rair67yUDV-GOTkCBpwHQK6J2M,419
 teareduce/wavecal.py,sha256=nu0iYM2475pJr3btODa5T8XKgNVA-kc8Fsio9Oe2biY,68582
 teareduce/write_array_to_fits.py,sha256=kWDrEH9coJ1yIu56oQJpWtDqJL4c8HGmssE9jle4e94,617
 teareduce/zscale.py,sha256=SDgmcDD2N5GvDn46JADCgTQJPBF_N_jSKMHoeTz9Nsw,1152
@@ -23,8 +23,8 @@ teareduce/cleanest/__init__.py,sha256=1rcfu97uqj3R-OZbU9HHLYaTzWkS-poRFBBy8nuH7p
 teareduce/cleanest/__main__.py,sha256=sTMk3vEfGYcF58MjVZaycWk3jRLIS1vYK2qp40EcTNA,5904
 teareduce/cleanest/askextension.py,sha256=Q6mGLA6ajUcDU4gsVA4P78GsPei0c7iZK1f7SfK9iVo,3014
 teareduce/cleanest/centerchildparent.py,sha256=wHxOvNrrQ-KBLZAbtQ9bJAxYhGOzqYBF4LgdIQk7UF8,1285
-teareduce/cleanest/cosmicraycleanerapp.py,sha256=6Qlc4A-PlFj_2gEwAX8_6xkacrAjsetORe_BCA5EawQ,80965
-teareduce/cleanest/definitions.py,sha256=LkU5AaL49TZH3N3ke84ilRmH2ev2Naf9Bi8SpMaPIpo,7780
+teareduce/cleanest/cosmicraycleanerapp.py,sha256=cI2Ywu93zq3MMSIpbFSP3n4JxAdkr2aogJuNgnCzX5A,80965
+teareduce/cleanest/definitions.py,sha256=pq_ZYEn16nvNMdvkOD71PB0Y4p1tIaNJFYd8hsq59Nc,7782
 teareduce/cleanest/dilatemask.py,sha256=I5tHAv5VEO6V0Wed8Ar20uLt4F9P-tgjmLL5BAaFvgM,1276
 teareduce/cleanest/find_closest_true.py,sha256=mWdIvhipzAXDRKfePDrP7f0lP4U48cckpHiKwiB4jHI,1320
 teareduce/cleanest/gausskernel2d_elliptical.py,sha256=f6AT0ZHmLCd83NAIyyJ8ODlihMeeTkmvNnUSK3vjP9I,1606
@@ -33,12 +33,12 @@ teareduce/cleanest/interpolate.py,sha256=eB9pVkEyJsNorKKV4Dx-j0UldBV6bgWSQBosYka
 teareduce/cleanest/interpolation_a.py,sha256=iyAEbh0Bf74OfAVhZjSvP3cO7pDC8eVDrVnDUd18FZQ,4030
 teareduce/cleanest/interpolation_x.py,sha256=MZhtlZZuMLvLnOK0EsLkJM3_dpyNHsxQL_BU1vLt9Lw,3767
 teareduce/cleanest/interpolation_y.py,sha256=ZX1Uv3FOxoLHtuR_yspcSA5B81CK_J0oNJ1ztzp0l5g,3782
-teareduce/cleanest/interpolationeditor.py,sha256=89xMDrCrPtKykdePHv1clHHqV24T0lfNsgC0QrpUtKY,20604
+teareduce/cleanest/interpolationeditor.py,sha256=W6FCa8YvaPMyRcX6q_WrRzEjs5Hb4t0rzepMir5tFlA,20608
 teareduce/cleanest/lacosmicpad.py,sha256=Ox6XpgZ7O_HmSth-6IiTY09NuskqMu0NfMjZBTbb1h0,7607
 teareduce/cleanest/mergemasks.py,sha256=TdbfQl5ETxtyFfod0WCD7Czzmgt-WxYOk3hpLqGNOTQ,2620
 teareduce/cleanest/modalprogressbar.py,sha256=uwd-p92PvOVJnbXd-B8DRcBZ--keKpr4ZN9PLeqm1Ws,6449
 teareduce/cleanest/parametereditor.py,sha256=XvJuvwhkeGyqZHESz0rdkAydBqnJQmKP2YwUz1H4bzE,41818
-teareduce/cleanest/reviewcosmicray.py,sha256=e0tpyHAPwr_F8arcFGvT-s9cOXJBFfTdsWfYgcEu_mU,40559
+teareduce/cleanest/reviewcosmicray.py,sha256=4onD7sUwgHaFPhrnNkLK3ivNA68Qc_DS3RC6G0n1xW4,40561
 teareduce/cleanest/trackedbutton.py,sha256=r6Mzhb24c3HaJdvGGGFLn7cF9n4TgsKYc_yfcYIyB4g,2348
 teareduce/cookbook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 teareduce/cookbook/get_cookbook_file.py,sha256=vde-iNii2lm1QII8GmLRsFsKNxkdsd7njCBE-8Z7io0,1088
@@ -46,9 +46,9 @@ 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.6.6.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-teareduce-0.6.6.dist-info/METADATA,sha256=ft_m9sDNfyHZF_9SLIOlMVSx6nNY6pcTMQM4HJHg4mw,3826
-teareduce-0.6.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-teareduce-0.6.6.dist-info/entry_points.txt,sha256=6yBvig5jTL2ugqz5SF767AiszzrHKGRASsX1II84kqA,66
-teareduce-0.6.6.dist-info/top_level.txt,sha256=7OkwtX9zNRkGJ7ACgjk4ESgC74qUYcS5O2qcO0v-Si4,10
-teareduce-0.6.6.dist-info/RECORD,,
+teareduce-0.6.7.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+teareduce-0.6.7.dist-info/METADATA,sha256=wobVWo_cxUm1u_YWE6fp8o7YzwCEN0Ya5UsNR62E1M8,4081
+teareduce-0.6.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+teareduce-0.6.7.dist-info/entry_points.txt,sha256=6yBvig5jTL2ugqz5SF767AiszzrHKGRASsX1II84kqA,66
+teareduce-0.6.7.dist-info/top_level.txt,sha256=7OkwtX9zNRkGJ7ACgjk4ESgC74qUYcS5O2qcO0v-Si4,10
+teareduce-0.6.7.dist-info/RECORD,,