teareduce 0.6.5__tar.gz → 0.6.7__tar.gz

{teareduce-0.6.5/src/teareduce.egg-info → teareduce-0.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: teareduce
-Version: 0.6.5
+Version: 0.6.7
 Summary: Utilities for astronomical data reduction
 Author-email: Nicolás Cardiel <cardiel@ucm.es>
 License: GPL-3.0-or-later
@@ -30,6 +30,8 @@ Requires-Dist: scipy
 Requires-Dist: tqdm
 Provides-Extra: cleanest
 Requires-Dist: ccdproc; extra == "cleanest"
+Requires-Dist: cosmic-conn; extra == "cleanest"
+Requires-Dist: deepCR; extra == "cleanest"
 Requires-Dist: maskfill; extra == "cleanest"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
@@ -37,6 +39,8 @@ Dynamic: license-file
 
 # 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.
 
 This package is not intended to be a general-purpose image reduction code. It
@@ -68,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/):
@@ -92,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
@@ -102,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.5 → teareduce-0.6.7}/README.md

@@ -1,5 +1,7 @@
 # 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.
 
 This package is not intended to be a general-purpose image reduction code. It
@@ -31,13 +33,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/):
@@ -55,6 +50,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
@@ -65,7 +74,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.5 → teareduce-0.6.7}/pyproject.toml

@@ -45,6 +45,8 @@ dependencies = [
 # Version with dependencies needed to run the tea-cleanest script
 cleanest = [
     "ccdproc",
+    "cosmic-conn",
+    "deepCR",
     "maskfill",
 ]
 

{teareduce-0.6.5 → teareduce-0.6.7}/src/teareduce/cleanest/__main__.py

@@ -19,6 +19,7 @@ import platform
 from rich import print
 from rich_argparse import RichHelpFormatter
 
+from .askextension import ask_extension_input_image
 from .definitions import DEFAULT_FONT_FAMILY
 from .definitions import DEFAULT_FONT_SIZE
 from .definitions import DEFAULT_TK_WINDOW_SIZE_X
@@ -85,17 +86,14 @@ def main():
         root.withdraw()  # Hide the root window
         args.input_fits = filedialog.askopenfilename(
             title="Select FITS file to be cleaned",
+            initialdir=os.getcwd(),
             filetypes=[("FITS files", "*.fits *.fit *.fts"), ("All files", "*.*")],
         )
         if not args.input_fits:
             print("No input FITS file selected. Exiting.")
             exit(1)
         print(f"Selected input FITS file: {args.input_fits}")
-        args.extension = simpledialog.askstring(
-            "Select Extension",
-            f"\nEnter extension number or name for file:\n{Path(args.input_fits).name}",
-            initialvalue=args.extension,
-        )
+        args.extension = ask_extension_input_image(args.input_fits, imgshape=None)
         # Ask for auxiliary file if not provided
         if args.auxfile is None:
             use_auxfile = tk.messagebox.askyesno(
@@ -116,11 +114,7 @@ def main():
             use_auxfile = True
         if use_auxfile:
             print(f"Selected auxiliary FITS file: {args.auxfile}")
-            args.extension_auxfile = simpledialog.askstring(
-                "Select Extension for Auxiliary File",
-                f"\nEnter extension number or name for auxiliary file:\n{Path(args.auxfile).name}",
-                initialvalue=args.extension_auxfile,
-            )
+            args.extension_auxfile = ask_extension_input_image(args.auxfile, imgshape=None)
         root.destroy()
 
     # Check that input files, and the corresponding extensions, exist