Update of Ima class + fix some bugs.

Alain Klotz
1 parent d1b0d799
Showing 5 changed files with 227 additions and 46 deletions Show diff stats
gui/tp_audine_elec/tp_audine_elec.py
gui/visu_double/visu_double.py
src/guitastro/astrotables.py
src/guitastro/filenames.py
src/guitastro/ima.py
@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+"""
+Created on Thu Mar 11 15:39:17 2021
+
+@author: alain
+"""
+
+import os
+import sys
+import yaml
+
+import tkinter as tk
+
+path = os.path.abspath("../../src")
+if path not in sys.path:
+        sys.path.insert(0,path)
+import guitastro
+
+# #####################################################################
+# #####################################################################
+# #####################################################################
+# Main
+# #####################################################################
+# #####################################################################
+# #####################################################################
+
+if __name__ == "__main__":
+
+    # --- Get path_images for examples
+    ima = guitastro.Ima()
+    path_products = ima.copy_data2products()
+    fconfig = os.path.join(path_products,"tp_audine_elec.yml")
+    if not os.path.exists(fconfig):
+        config = {}
+        conf = {}
+        conf["fits_path"] = path_products
+        config["visu1"] = conf
+    else:
+        with open(fconfig, 'r') as stream:
+            try:
+                config = yaml.safe_load(stream)
+            except yaml.YAMLError as exc:
+                print(exc)
+
+    def save_config():
+        global fconfig
+        with open(fconfig, 'w') as yaml_file:
+            yaml.dump(config, yaml_file, default_flow_style=False)
+
+    def ima1_load():
+        global widgets
+        path_cur = config["visu1"]["fits_path"]
+        ima1.rootdir = path_cur
+        fullfile = ima1.load()
+        if fullfile != "":
+            path_new = os.path.dirname(fullfile)
+            if path_cur != path_new and path_new != "":
+                config["visu1"]["fits_path"] = path_new
+                save_config()
+        visu1.autocuts()
+        visu1.disp()
+        widgets["button_saveima_1"].configure(state= tk.NORMAL)
+
+    def ima1_save():
+        ima1.save()
+
+    # --- load an image from a FITS file
+    ima1 = guitastro.Ima()
+    ima1.extension = ".fit"
+
+    # --- Create a simple Tk interface
+    tkroot = tk.Tk()
+    tkroot.geometry("800x600+120+80")
+    tkroot.title("TP Audine Electronique")
+    # ---
+    frame1 = tk.Frame(tkroot)
+    frame1.pack(side = tk.LEFT, fill=tk.BOTH, expand=tk.YES)
+    # ---
+    widgets = {}
+    # ---
+    frame1m = tk.Frame(frame1)
+    widgets["button_loadima_1"] = tk.Button(frame1m, text="Load FITS", command=ima1_load)
+    widgets["button_loadima_1"].pack(side=tk.LEFT, padx = 2)
+    widgets["button_saveima_1"] = tk.Button(frame1m, text="Save FITS", command=ima1_save, state= tk.DISABLED)
+    widgets["button_saveima_1"].pack(side=tk.LEFT, padx = 2)
+    frame1m.pack(fill=tk.BOTH, expand=tk.NO)
+    # ---
+    tkroot.pack_propagate(0)
+    tkroot.update()
+
+    # --- Create and use a visu
+    try:
+        frame1i = tk.Frame(frame1)
+        frame1i.pack(side = tk.TOP, fill=tk.BOTH, expand=tk.YES)
+        visu1 = guitastro.Visu(frame1i)
+        visu1.ima(ima1)
+        #visu1.autocuts()
+        #visu1.disp()
+
+    except:
+        msg = "{}".format(sys.exc_info())
+        print(msg)
+
+    # --- Launch the event loop of the user interface
+    tkroot.update()
+    tkroot.mainloop()
+
@@ -53,7 +53,7 @@ if __name__ == &quot;__main__&quot;:
     def ima1_load():
         global widgets
         path_cur = config["visu1"]["fits_path"]
-        ima1.path(path_cur)
+        ima1.rootdir = path_cur
         fullfile = ima1.load()
         if fullfile != "":
             path_new = os.path.dirname(fullfile)
@@ -70,7 +70,7 @@ if __name__ == &quot;__main__&quot;:
     def ima2_load():
         global widgets
         path_cur = config["visu2"]["fits_path"]
-        ima2.path(path_cur)
+        ima2.rootdir = path_cur
         fullfile = ima2.load()
         if fullfile != "":
             path_new = os.path.dirname(fullfile)
@@ -415,7 +415,7 @@ class AstroTable(AstroTableException, GuitastroTools):
         self._verify_table()
         return self.t.keys()
  
-    def getcol(self, colname: str):
+    def getcol(self, colname: str, unit: bool=False):
         """Return the values of a column of a given name
  
         Example:
@@ -439,6 +439,9 @@ class AstroTable(AstroTableException, GuitastroTools):
         """
         self._verify_table()
         col = self.t[colname]
+        if str(type(col)) == "<class 'astropy.utils.masked.core.MaskedQuantity'>" or str(type(col)) == "<class 'astropy.units.quantity.Quantity'>":
+            if unit == False:
+                col = col.value
         return col
  
     def setcol(self, colname: str, colvalues: Any, **kwargs):
@@ -836,6 +839,59 @@ class AstroTable(AstroTableException, GuitastroTools):
         nrow, ncol = self.shape()
         self.t.remove_rows(indexes)
  
+    def keepvalidrows(self, colnames: list):
+        """Keep only rows where data of colnames are valids.
+
+        Example:
+
+        To delete rows from an index to another one:
+
+        ::
+
+            at = AstroTable()
+            at.table(None)
+            col = at.getcol('x').copy()
+            col[2] = np.nan
+            at.setcol("z", col * u.mag)
+            at.keepvalidrows(["x", "y", "z"])
+            at
+
+        The result is:
+
+        ::
+
+            ====================
+            Metadata:
+            DATE-OBS = 2020-02-22T02:20:22
+            AUTHOR = Guitastro
+            ====================
+            Table:
+             x   y   z
+                    mag
+            --- --- ---
+            0.0 0.0 0.0
+            1.0 1.0 1.0
+            3.0 9.0 3.0
+
+        """
+        self._verify_table()
+        nrow, ncol = self.shape()
+        bad_indexes = set()
+        for colname in colnames:
+            col = self.getcol(colname, False)
+            print(f"{colname=} {str(type(col))=} {col=}")
+            if str(type(col)) == "<class 'astropy.utils.masked.core.MaskedNDArray'>":
+                idxs = set(np.where(col.mask == True)[0])
+                print(f"{colname=} {idxs=}")
+                bad_indexes.update(idxs)
+            if str(type(col)) == "<class 'numpy.ndarray'>":
+                idxs = set(np.where(np.isnan(col))[0])
+                print(f"{colname=} {idxs=}")
+                bad_indexes.update(idxs)
+        bad_indexes = list(bad_indexes)
+        print(f"{bad_indexes=}")
+        self.t.remove_rows(bad_indexes)
+
     # =============================================
     # Manage table metadata
     # =============================================
@@ -1704,7 +1760,7 @@ class AstroTable(AstroTableException, GuitastroTools):
         except IndexError:
             raise AstroTableException(AstroTableException.NO_OBJECT_FOUND)
         except:
-            msg = sys.exc_info()[0]
+            msg = repr(sys.exc_info()[0])
             raise AstroTableException(AstroTableException.ERROR_NOT_REFERENCED, msg)
  
         if table is not None:
@@ -1746,8 +1802,8 @@ class AstroTable(AstroTableException, GuitastroTools):
  
 if __name__ == "__main__":
  
-    default = 7
-    example = input(f"Select the example (0 to 7) ({default}) ")
+    default = 8
+    example = input(f"Select the example (0 to 8) ({default}) ")
     try:
         example = int(example)
     except:
@@ -1940,3 +1996,15 @@ if __name__ == &quot;__main__&quot;:
         plt.ylabel('T sky')
         plt.show()
  
+    if example == 8:
+        at = AstroTable()
+        at.table(None)
+        col = at.getcol('x').copy()
+        col[2] = np.nan
+        at.setcol("z", col * u.mag)
+        at.keepvalidrows(["x", "y", "z"])
+
+    if example == 9:
+        at = AstroTable()
+        at.catalog("1h5m13s", "+13d56m32s", "0.5d", "0.5d", "GAIA", "IDRADECMAGS", column_filters = {"gmag": "<16"})
+
@@ -2975,7 +2975,7 @@ class FileNames(FileNamesException, GuitastroTools):
     def _askopenfilename(self, title="", filetypes=""):
         root = tk.Tk()
         root.withdraw() # To avoid display of the Tk window
-        initialdir = self._image_dir
+        initialdir = self.rootdir
         if filetypes == "":
             filetypes = [("FITS","*.fit;*.fits;*.fts;*.gz"),("All", "*")]
         fitsname = askopenfilename(title=title, initialdir=initialdir, filetypes = filetypes)
@@ -2983,14 +2983,14 @@ class FileNames(FileNamesException, GuitastroTools):
             filename, file_extension = os.path.splitext(fitsname)
             if file_extension=="":
                 fitsname += self._fits_extension
-            self._image_dir = os.path.dirname(fitsname)
+            self.rootdir = os.path.dirname(fitsname)
         root.destroy()
         return fitsname
  
     def _asksaveasfilename(self, title="", filetypes=""):
         root = tk.Tk()
         root.withdraw() # To avoid display of the Tk window
-        initialdir = self._image_dir
+        initialdir = self.rootdir
         if filetypes == "":
             filetypes = [("FITS","*.fit;*.fits;*.fts;*.gz"),("All", "*")]
         fitsname = asksaveasfilename(title=title, initialdir=initialdir, filetypes = filetypes)
@@ -2998,7 +2998,7 @@ class FileNames(FileNamesException, GuitastroTools):
             filename, file_extension = os.path.splitext(fitsname)
             if file_extension=="":
                 fitsname += self._fits_extension
-            self._image_dir = os.path.dirname(fitsname)
+            self.rootdir = os.path.dirname(fitsname)
         root.destroy()
         return fitsname
  
@@ -1994,7 +1994,8 @@ class Ima(ImaException, FileNames):
                 for lstdo in lstdos:
                     print(lstdo)
                 # --- On charge tmp.wcs
-                wcsname = os.path.join(ima1.path(), "tmp.wcs")
+                #wcsname = os.path.join(self.rootdir, "tmp.wcs")
+                wcsname = self.join("tmp.wcs")
                 wcs_header = []
                 if os.path.exists(wcsname)==False:
                     # Code to execute when solve fails
@@ -2006,7 +2007,8 @@ class Ima(ImaException, FileNames):
                     wcs_header = False
                 else:
                     # --- On charge tmp.new comme image calibrée
-                    newname = os.path.join(ima1.path(), "tmp.new")
+                    #newname = os.path.join(ima1.rootdir = ), "tmp.new")
+                    newname = self.join("tmp.new")
                     self.load(newname)
                     with open(wcsname,"rt") as fid:
                         while True:
@@ -3130,7 +3132,7 @@ class Ima(ImaException, FileNames):
             tot_sigs = []
             sig2fwhm = 2*math.sqrt(2*math.log(2))
             for x, y, mag in zip(xs, ys, mags):
-                self.etc.inputs("m", mag.value)
+                self.etc.inputs("m", float(mag))
                 self.etc.t2snr_computations()
                 res = self.etc.simu_star_params(unit="adu")
                 amplitudes.append(res["max_sig"][0])
@@ -3546,8 +3548,7 @@ if __name__ == &quot;__main__&quot;:
         Just a visu
         """
         ima1 = Ima()
-        ima1.extension(".fit")
-        ima1.path(path_products)
+        ima1.fcontext = "image_in"
         ima1.load("m57")
         ima1.visu()
  
@@ -3556,8 +3557,7 @@ if __name__ == &quot;__main__&quot;:
         A call of sextractor
         """
         ima1 = Ima()
-        ima1.extension(".fit")
-        ima1.path(path_products)
+        ima1.fcontext = "image_in"
         ima1.load("m57")
         stars = ima1.sextractor(kappa_sigma = 0.2, pixel_radius=3.5)
         stars.xy2radec()
@@ -3588,8 +3588,7 @@ if __name__ == &quot;__main__&quot;:
         A call of DAOphot
         """
         ima1 = Ima()
-        ima1.extension(".fit")
-        ima1.path(path_products)
+        ima1.fcontext = "image_in"
         ima1.load("m57")
         radii = np.linspace(2,10,(10-2+1))
         stars = ima1.daophot(kappa_sigma = 1, phot_radii=radii)
@@ -3642,8 +3641,7 @@ if __name__ == &quot;__main__&quot;:
         Subsky
         """
         ima1 = Ima()
-        ima1.extension(".fit")
-        ima1.path(path_products)
+        ima1.fcontext = "image_in"
         ima1.load("m57")
         res = ima1.subsky()
         ima1.visu()
@@ -3653,23 +3651,24 @@ if __name__ == &quot;__main__&quot;:
         Mult
         """
         ima1 = Ima()
-        ima1.extension(".fit")
-        ima1.path(path_products)
+        ima1.fcontext = "image_in"
         ima1.load("m57")
         ima1.stat()
         ima1.mult(.2)
-        ima1.stat()
+        stat = ima1.stat()
+        print(f"{stat=}")
  
     if example == 7:
         """
         A call of sextractor + match ra,dec with a catalog
         """
         ima1 = Ima()
-        ima1.extension(".fit")
-        ima1.path(path_products)
+        ima1.fcontext = "image_in"
         ima1.load("m57")
         infos = ima1.wcs_infos()
-        if False:
+        # --- File name of the Astrotable
+        filename = os.path.join(path_products,"image_sources.txt")
+        if not os.path.exists(filename):
             # === Case the AstroTable need to be written in the disk
             # --- Create an AstroTable of sources in the image (x,y,flux,etc.)
             stars = ima1.sextractor(kappa_sigma = 0.2, pixel_radius=3.5)
@@ -3678,7 +3677,6 @@ if __name__ == &quot;__main__&quot;:
             # --- Keep only interesting columns in the AstroTable
             stars.keepcols(['x','y','app_flux', 'app_fluxerr', 'ra','dec'])
             # --- Save the AstroTable on disk
-            filename = os.path.join(path_products,"image_sources.txt")
             stars.write(filename, format='astrotable', overwrite=True)
             # ===
             # --- Create an AstroTable of cataloged sources in the image (ra,dec,mag,etc.)
@@ -3690,7 +3688,6 @@ if __name__ == &quot;__main__&quot;:
         else:
             # === Case the AstroTable are read from the disk
             # --- Load the AstroTables
-            filename = os.path.join(path_products,"image_sources.txt")
             stars = AstroTable()
             stars.read(filename, format='astrotable')
             catstars = AstroTable()
@@ -3704,36 +3701,42 @@ if __name__ == &quot;__main__&quot;:
         flux = stars.getcol('app_flux')
         maginst = -2.5*np.log10(flux)
         stars.setcol("maginst", maginst * u.mag)
+        # --- Keep only rows with valid values in given columns
+        stars.keepvalidrows(['maginst', 'magABg', 'magABr'])
         # --- Get the catalog magnitudes
         magABg = stars.getcol('magABg')
         magABr = stars.getcol('magABr')
         magABgr = magABg - magABr
         maginst = stars.getcol('maginst')
         zeromags = magABr - maginst
+        # --- plots
+        # import matplotlib.pyplot as plt
         plt.plot(magABgr, zeromags, 'ob')
+        plt.xlabel('(g-r) AB')
+        plt.ylabel('zeromag r AB')
+        plt.show()
         zeromag = np.nanmean(zeromags)
         zeromag_std = np.nanstd(zeromags)
         print(f"zeromag = {zeromag:.2f} +/- {zeromag_std:.2f}")
+        plt.plot(magABr, zeromags, 'or')
+        plt.xlabel('r AB')
+        plt.ylabel('zeromag r AB')
+        plt.show()
  
     if example == 8:
         from astropy.nddata import CCDData
         ima1 = Ima()
-        ima1.extension(".fit")
-        ima1.path(path_products)
-        image_file_path = ima1.load("i")
-        #image_file_path = 'D:\\srv\\develop\\astromeccadev\\astromecca_data\\images\\i.fit'
+        ima1.fcontext = "image_in"
+        image_file_path = ima1.join("m57")
         ccd = CCDData.read(image_file_path, unit='adu')
         data = ccd.data
-        ima1.save("i")
-        ima1.load("i")
  
     if example == 9:
         """
         Calibwcs examples
         """
         ima1 = Ima()
-        ima1.extension(".fit")
-        ima1.path(path_products)
+        ima1.fcontext = "image_in"
         ima1.load("m57")
         # --- Delete all previous WCS header cards
         success, comment, detail = ima1.calibwcs("delete")
@@ -3780,6 +3783,7 @@ if __name__ == &quot;__main__&quot;:
  
     if example == 10:
         ima1 = Ima()
+        ima1.fcontext = "image_in"
         fitsname = "m57"
         ima1.load(fitsname)
         ima1.sortx(50)
@@ -3793,8 +3797,7 @@ if __name__ == &quot;__main__&quot;:
  
     if example == 11:
         ima1 = Ima()
-        ima1.extension(".fit")
-        ima1.path(path_products)
+        ima1.fcontext = "image_in"
         ima1.load("m57")
         sources, phot_table = ima1.daophot()
         # stars.colnames
@@ -3830,8 +3833,7 @@ if __name__ == &quot;__main__&quot;:
         fitgauss
         """
         ima1 = Ima()
-        ima1.extension(".fit")
-        ima1.path(path_products)
+        ima1.fcontext = "image_in"
         ima1.load("m57")
         box = [200,40,220,60]
         #ima1.window(box)
@@ -3857,6 +3859,10 @@ if __name__ == &quot;__main__&quot;:
         print(resultx.fit_report())
         print("="*15)
         print(resulty.fit_report())
+        print("="*15)
+        print(f"{flux=:.2f} +/- {dflux:.2f} adu")
+        print(f"{fwhm=:.2f} +/- {dfwhm:.2f} pix")
+        print(f"{bg=:.2f} +/- {dbg:.2f} adu")
  
     if example == 13:
         """
@@ -3866,10 +3872,10 @@ if __name__ == &quot;__main__&quot;:
  
     if example == 14:
         ima1 = Ima()
-        ima1.extension(".fit")
-        ima1.path(path_products)
+        ima1.fcontext = "image_in"
         ima1.load("m57")
-        ima1.corners(34,50)
+        ima1.corners(20,20)
+        ima1.visu()
  
     if example == 15:
         """
@@ -3888,13 +3894,13 @@ if __name__ == &quot;__main__&quot;:
         Simulation
         """
         ima1 = Ima()
+        ima1.fcontext = "image_in"
         ima1.etc.camera("Kepler 4040")
         ima1.etc.optics("Takahashi_180ED")
         ima1.etc.params("msky",18)
         ra = 132.84583
         dec = 11.81333
         at = ima1.simulation("GAIA", "PHOTOM", shutter_mode="opened", t=50, ra=ra, dec=dec, column_filters = {"Gmag": "<15"})
-        ima1.path(path_products)
         ima1.save("test_simulation")
  
         # --- Create a simple Tk interface
@@ -3934,7 +3940,7 @@ if __name__ == &quot;__main__&quot;:
         # --- Load the image
         ima1 = Ima()
         ima1.extension(".fit")
-        ima1.path(path_ima)
+        ima1.rootdir = path_ima
         ima1.load(file_ima)
         # --- Crop the image to eliminate borders
         if len(crop_box) > 0: