teareduce 0.6.7__tar.gz → 0.6.9__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: teareduce
-Version: 0.6.7
+Version: 0.6.9
 Summary: Utilities for astronomical data reduction
 Author-email: Nicolás Cardiel <cardiel@ucm.es>
 License: GPL-3.0-or-later
@@ -113,7 +113,7 @@ In addition, in order to make use of the **PyCosmic** algorithm with
 (venv_teareduce) $ ipython
 In [1]: import teareduce as tea
 In [2]: print(tea.__version__)
-0.6.6
+0.6.7
 ```
 
 Note that in PyPI there is a package called **tea** that provides utilities

{teareduce-0.6.7 → teareduce-0.6.9}/README.md

@@ -74,7 +74,7 @@ In addition, in order to make use of the **PyCosmic** algorithm with
 (venv_teareduce) $ ipython
 In [1]: import teareduce as tea
 In [2]: print(tea.__version__)
-0.6.6
+0.6.7
 ```
 
 Note that in PyPI there is a package called **tea** that provides utilities

{teareduce-0.6.7 → teareduce-0.6.9}/src/teareduce/cleanest/cosmicraycleanerapp.py

@@ -20,11 +20,13 @@ from astropy.io import fits
 
 try:
     import PyCosmic
+
     PYCOSMIC_AVAILABLE = True
 except ModuleNotFoundError as e:
-    print("The 'teareduce.cleanest' module requires the 'PyCosmic' package.\n"
-          "Please install this module using:\n"
-          "`pip install git+https://github.com/nicocardiel/PyCosmic.git@test`"
+    print(
+        "The 'teareduce.cleanest' module requires the 'PyCosmic' package.\n"
+        "Please install this module using:\n"
+        "`pip install git+https://github.com/nicocardiel/PyCosmic.git@test`"
     )
     PYCOSMIC_AVAILABLE = False
 
@@ -391,7 +393,6 @@ class CosmicRayCleanerApp(ImageDisplay):
         )
         self.stop_button.pack(side=tk.LEFT, padx=5)
 
-
         # Row 2 of buttons
         self.button_frame2 = tk.Frame(self.root)
         self.button_frame2.pack(pady=5)
@@ -850,8 +851,8 @@ class CosmicRayCleanerApp(ImageDisplay):
             hdu.writeto(output_fits, overwrite=True)
             print(f"Last mask saved to {output_fits}")
         except Exception as e:
-            print(f"Error saving mask into a FITS file: {e}")  
-  
+            print(f"Error saving mask into a FITS file: {e}")
+
     def set_cursor_onoff(self):
         """Toggle cursor selection mode on or off."""
         if not self.use_cursor:
@@ -1539,7 +1540,7 @@ class CosmicRayCleanerApp(ImageDisplay):
                 cleandata_deepcr=self.cleandata_deepcr,
                 cr_labels=tmp_cr_labels,
                 num_features=1,
-                first_cr_index=1,
+                first_cr_index=first_cr_index,
                 single_cr=True,
                 last_dilation=self.lacosmic_params["dilation"]["value"],
                 last_npoints=self.last_npoints,

{teareduce-0.6.7 → teareduce-0.6.9}/src/teareduce/cleanest/reviewcosmicray.py

@@ -98,6 +98,8 @@ class ReviewCosmicRay(ImageDisplay):
             Number of connected cosmic ray pixel groups.
         first_cr_index : int, optional
             The index of the first cosmic ray to review (default is 1).
+            If set to 0, the user have selected the CR region
+            directly with the mouse cursor.
         single_cr : bool, optional
             Whether to review a single cosmic ray (default is False).
             If True, the review window will close after reviewing the
@@ -236,7 +238,11 @@ class ReviewCosmicRay(ImageDisplay):
         if self.num_features == 0:
             print("No CR hits found!")
         else:
-            self.cr_index = first_cr_index
+            self.first_cr_index = first_cr_index
+            if self.first_cr_index == 0:  # Select CR directly with mouse cursor
+                self.cr_index = 1
+            else:
+                self.cr_index = self.first_cr_index
             self.single_cr = single_cr
             self.create_widgets()
             center_on_parent(child=self.root, parent=self.root.master, offset_x=50, offset_y=50)
@@ -494,11 +500,14 @@ class ReviewCosmicRay(ImageDisplay):
         ycr_list, xcr_list = np.where(self.cr_labels == self.cr_index)
         ycr_list_original, xcr_list_original = np.where(self.cr_labels_original == self.cr_index)
         if self.first_plot:
-            print(
-                f"Cosmic ray {self.cr_index}: "
-                f"Number of pixels = {len(xcr_list)}, "
-                f"Centroid = ({np.mean(xcr_list)+1:.2f}, {np.mean(ycr_list)+1:.2f})"
-            )
+            if self.first_cr_index == 0:
+                print(f"Centroid = ({np.mean(xcr_list)+1:.2f}, {np.mean(ycr_list)+1:.2f})")
+            else:
+                print(
+                    f"Cosmic ray {self.cr_index}: "
+                    f"Number of pixels = {len(xcr_list)}, "
+                    f"Centroid = ({np.mean(xcr_list)+1:.2f}, {np.mean(ycr_list)+1:.2f})"
+                )
         # Use original positions to define the region to display in order
         # to avoid image shifts when some pixels are unmarked or new ones are marked
         i0 = int(np.mean(ycr_list_original) + 0.5)
@@ -564,7 +573,10 @@ class ReviewCosmicRay(ImageDisplay):
                 self.ax.plot([xcr - 0.5, xcr + 0.5], [ycr - 0.5, ycr + 0.5], "r-")
         self.ax.set_xlim(xlim)
         self.ax.set_ylim(ylim)
-        self.ax.set_title(f"Cosmic ray #{self.cr_index}/{self.num_features}")
+        if self.first_cr_index == 0:
+            self.ax.set_title("Selecting CR pixels with mouse cursor")
+        else:
+            self.ax.set_title(f"Cosmic ray #{self.cr_index}/{self.num_features}")
         if self.first_plot:
             self.first_plot = False
         self.canvas.draw_idle()
@@ -743,7 +755,7 @@ class ReviewCosmicRay(ImageDisplay):
         self.num_cr_cleaned += 1
         self.set_buttons_after_cleaning_cr()
         self.update_display(cleaned=True)
-    
+
     def use_deepcr(self):
         """Use deepCR cleaned data to clean a cosmic ray."""
         if self.cleandata_deepcr is None:
@@ -895,10 +907,10 @@ class ReviewCosmicRay(ImageDisplay):
             iy = int(y + 0.5) - 1  # from pixel to index
             if int(self.cr_labels[iy, ix]) == self.cr_index:
                 self.cr_labels[iy, ix] = 0
-                print(f"Pixel ({ix+1}, {iy+1}) unmarked as cosmic ray.")
+                print(f"Pixel ({ix+1}, {iy+1}) unmarked as CR pixel.")
             else:
                 self.cr_labels[iy, ix] = self.cr_index
-                print(f"Pixel ({ix+1}, {iy+1}), with signal {self.data[iy, ix]}, marked as cosmic ray.")
+                print(f"Pixel ({ix+1}, {iy+1}), with signal {self.data[iy, ix]}, marked as CR pixel.")
             xcr_list, ycr_list = np.where(self.cr_labels == self.cr_index)
             if len(xcr_list) == 0:
                 self.disable_interpolation_buttons()

{teareduce-0.6.7 → teareduce-0.6.9}/src/teareduce/simulateccdexposure.py

@@ -194,7 +194,7 @@ class SimulateCCDExposure:
 
     CCD exposures are simulated making use of basic CCD parameters,
     such as gain, readout noise, bias, dark and flat field.
-    A data model can also be employed to simulate more realising
+    A data model can also be employed to simulate more realistic
     CCD exposures.
 
     The saturated pixels in 'data_model' are returned as 2**bitpix - 1
@@ -230,6 +230,8 @@ class SimulateCCDExposure:
         Numpy array with the pixel to pixel sensitivity (without units).
     data_model : Quantity
         Numpy array with the model of the source to be simulated (ADU).
+        Note that this is the model before applying the flatfield.
+        The values in this array must be the total ADU for each pixel.
     seed : int or None
         Random number generator seed.
     _rng : np.random.RandomState

{teareduce-0.6.7 → teareduce-0.6.9}/src/teareduce/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: teareduce
-Version: 0.6.7
+Version: 0.6.9
 Summary: Utilities for astronomical data reduction
 Author-email: Nicolás Cardiel <cardiel@ucm.es>
 License: GPL-3.0-or-later
@@ -113,7 +113,7 @@ In addition, in order to make use of the **PyCosmic** algorithm with
 (venv_teareduce) $ ipython
 In [1]: import teareduce as tea
 In [2]: print(tea.__version__)
-0.6.6
+0.6.7
 ```
 
 Note that in PyPI there is a package called **tea** that provides utilities