pyGCG 0.6.3__tar.gz → 0.7.2__tar.gz

{pyGCG-0.6.3 → pygcg-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyGCG
-Version: 0.6.3
+Version: 0.7.2
 Summary: A GUI to aid in viewing and classifying NIRISS data products from GLASS-JWST.
 Author-email: Peter Watson <peter.watson+pygcg@inaf.it>
 Project-URL: Homepage, https://github.com/PJ-Watson/pyGCG

{pyGCG-0.6.3 → pygcg-0.7.2}/pyGCG.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyGCG
-Version: 0.6.3
+Version: 0.7.2
 Summary: A GUI to aid in viewing and classifying NIRISS data products from GLASS-JWST.
 Author-email: Peter Watson <peter.watson+pygcg@inaf.it>
 Project-URL: Homepage, https://github.com/PJ-Watson/pyGCG

{pyGCG-0.6.3 → pygcg-0.7.2}/pygcg/GUI_main.py

@@ -14,6 +14,7 @@ from tqdm import tqdm
 from pygcg.tabs import BeamFrame, SpecFrame
 from pygcg.utils import ValidateFloatVar, flatten_dict, fpe
 from pygcg.windows import CommentsWindow, SearchWindow, SettingsWindow
+from itertools import product
 
 
 class GCG(ctk.CTk):
@@ -115,6 +116,17 @@ class GCG(ctk.CTk):
         )
 
         self.current_gal_data = {}
+        self.poss_extvers = []
+        for g, p in product(
+            [
+                self.config["grisms"]["B"],
+                self.config["grisms"]["G"],
+                self.config["grisms"]["R"],
+            ],
+            [self.config["grisms"]["PA1"], self.config["grisms"]["PA2"]],
+        ):
+            self.poss_extvers.append(f"{g},{p}")
+            self.current_gal_data[f"{g},{p}"] = {}
 
         self.warning_flag = True
 
@@ -270,6 +282,8 @@ class GCG(ctk.CTk):
                     self.temp_dir.mkdir(exist_ok=True)
 
                 out_name = self.config["files"].get("out_cat_name", "pyGCG_output.fits")
+                if out_name == "":
+                    out_name = "pyGCG_output.fits"
                 self.out_cat_path = fpe(self.config["files"]["out_dir"]) / out_name
                 self.read_write_button.configure(state="normal")
             except:
@@ -303,6 +317,7 @@ class GCG(ctk.CTk):
                         "GRIZLI_REDSHIFT",
                         "ESTIMATED_REDSHIFT",
                         "UNRELIABLE_REDSHIFT",
+                        "TENTATIVE_REDSHIFT",
                         "BAD_SEG_MAP",
                         "COMMENTS",
                     ],
@@ -327,8 +342,33 @@ class GCG(ctk.CTk):
                         float,
                         bool,
                         bool,
+                        bool,
                         str,
                     ],
+                    units=[
+                        None,
+                        None,
+                        "deg",
+                        "deg",
+                        None,
+                        None,
+                        None,
+                        None,
+                        None,
+                        None,
+                        None,
+                        None,
+                        None,
+                        None,
+                        None,
+                        None,
+                        None,
+                        None,
+                        None,
+                        None,
+                        None,
+                        None,
+                    ],
                 )
 
             for key, default in zip(
@@ -417,9 +457,13 @@ class GCG(ctk.CTk):
 
             pad = self.config.get("catalogue", {}).get("seg_id_length", 5)
 
-            row_ids = [s.stem[-4 - pad : -4] for s in dir_to_chk.glob("*.row.fits")]
-            stack_ids = [s.stem[-6 - pad : -6] for s in dir_to_chk.glob("*.stack.fits")]
-            oned_ids = [s.stem[-3 - pad : -3] for s in dir_to_chk.glob("*.1D.fits")]
+            row_ids = [s.stem[-4 - pad : -4] for s in dir_to_chk.glob("**/*.row.fits")]
+            stack_ids = [
+                s.stem[-6 - pad : -6] for s in dir_to_chk.glob("**/*.stack.fits")
+            ] + [
+                s.stem[-3 - pad : -3] for s in dir_to_chk.glob("**/*.2D.fits")
+            ]
+            oned_ids = [s.stem[-3 - pad : -3] for s in dir_to_chk.glob("**/*.1D.fits")]
 
             for i, (n, s) in tqdm(
                 enumerate(zip(self.id_col, self.seg_id_col)),
@@ -444,10 +488,17 @@ class GCG(ctk.CTk):
             self.id_col = self.id_col[id_idx_list]
             self.seg_id_col = self.seg_id_col[id_idx_list]
             self.cat = self.cat[id_idx_list]
-            self.sky_coords = SkyCoord(
-                self.cat[self.config.get("catalogue", {}).get("ra", "X_WORLD")],
-                self.cat[self.config.get("catalogue", {}).get("dec", "Y_WORLD")],
-            )
+            try:
+                self.sky_coords = SkyCoord(
+                    self.cat[self.config.get("catalogue", {}).get("ra", "X_WORLD")],
+                    self.cat[self.config.get("catalogue", {}).get("dec", "Y_WORLD")],
+                )
+            except:
+                self.sky_coords = SkyCoord(
+                    self.cat[self.config.get("catalogue", {}).get("ra", "X_WORLD")],
+                    self.cat[self.config.get("catalogue", {}).get("dec", "Y_WORLD")],
+                    unit="deg"
+                )
 
             assert len(self.id_col) > 0
 
@@ -799,7 +850,10 @@ class GCG(ctk.CTk):
         mid_message = (
             "Classifications will not be saved."
             if self.read_write_button.get().lower() == "read-only"
-            else "Classifications will be written to ??? in the output directory."
+            else (
+                f"Classifications will be written to "
+                f"{self.out_cat_path.name} in the output directory."
+            )
         )
         check_overwrite = CTkMessagebox(
             title="Read/Write Mode",
@@ -868,7 +922,7 @@ class GCG(ctk.CTk):
         flattened_data = flatten_dict(self.current_gal_data)
 
         if (
-            len(flattened_data) == 21
+            len(flattened_data) == 22
             and self.read_write_button.get() == "Write output"
             and np.sum([*self.object_progress.values()]) == 3
         ):
@@ -943,7 +997,6 @@ class GCG(ctk.CTk):
                 rad_val = f"{self.tab_row[rad_name]:.0f}"
             else:
                 rad_val = float(plate_scale) * self.tab_row[rad_name].value * u.arcsec
-                print(rad_val)
                 rad_val = f"{rad_val:.2f}"
             rad_text = f"r\u2096\u1d63\u2092\u2099 = {rad_val}"
         except Exception as e:
@@ -967,15 +1020,21 @@ class GCG(ctk.CTk):
             self.current_gal_data["unreliable_redshift"] = out_row[
                 "UNRELIABLE_REDSHIFT"
             ]
+            self.current_gal_data["tentative_redshift"] = out_row[
+                "TENTATIVE_REDSHIFT"
+            ]
             self.current_gal_data["bad_seg_map"] = out_row["BAD_SEG_MAP"]
 
+        for gp in self.poss_extvers:
+            self.current_gal_data[gp] = {}
+
     def change_sky_coord(self, event=None):
         new_coord = None
         try:
             new_coord = SkyCoord(self.current_gal_coords.get())
         except ValueError:
             try:
-                parts = re.split("\s*[,|;|\s]\s*", self.current_gal_coords.get())
+                parts = re.split(r"\s*[,|;|\s]\s*", self.current_gal_coords.get())
                 if len(parts) == 2:
                     new_coord = SkyCoord(
                         float(parts[0]) * u.deg, float(parts[1]) * u.deg

{pyGCG-0.6.3 → pygcg-0.7.2}/pygcg/example_config.toml

@@ -75,10 +75,6 @@ plate_scale = 0.03 # arcsec/pixel. If specified, radii are taken to be in pixels
         tex_name = 'NII'
         centre = 6585.27
 
-        [lines.emission.PaE]
-        tex_name = 'Pa-$\eta$'
-        centre = 9548.6
-
         [lines.emission.PaD]
         tex_name = 'Pa-$\delta$'
         centre = 10052.1
@@ -105,7 +101,11 @@ plate_scale = 0.03 # arcsec/pixel. If specified, radii are taken to be in pixels
 
         [lines.emission.SIII_9069]
         tex_name = 'SIII'
-        centre = 9068.6
+        centre = 9071.1
+        
+        [lines.emission.SIII_9531]
+        tex_name = 'SIII'
+        centre = 9533.2
 
         [lines.emission.HeI_10830]
         tex_name = 'HeI'

{pyGCG-0.6.3 → pygcg-0.7.2}/pygcg/tabs/beams.py

@@ -93,14 +93,11 @@ class BeamFrame(ctk.CTkFrame):
                     Path(self._root().config["files"]["extractions_dir"])
                     .expanduser()
                     .resolve()
-                ).glob(f"*{self._root().seg_id:0>{pad}}.stack.fits")
+                ).glob(f"**/*{self._root().seg_id:0>{pad}}.stack.fits")
             ][0]
         except:
             self.file_path = None
 
-        # print (self.master)
-        # if self._root().main_tabs.get() in self._root().tab_names[0:2]:
-        # print ("yes")
         self.generate_grid()
 
     def change_cmap(self, event=None):
@@ -119,7 +116,10 @@ class BeamFrame(ctk.CTkFrame):
         if self.gal_id == self._root().current_gal_id.get() and not force_update:
             self.beam_single_PA_frame.quality_frame.save_current()
             for k, v in self.beam_single_PA_frame.coverage.items():
-                self._root().current_gal_data[k]["coverage"] = v
+                try:
+                    self._root().current_gal_data[k]["coverage"] = v
+                except:
+                    pass
             pass
         else:
             self.gal_id = self._root().current_gal_id.get()
@@ -129,22 +129,11 @@ class BeamFrame(ctk.CTkFrame):
                     Path(self._root().config["files"]["extractions_dir"])
                     .expanduser()
                     .resolve()
-                ).glob(f"*{self._root().seg_id:0>{pad}}.stack.fits")
+                ).glob(f"**/*{self._root().seg_id:0>{pad}}.stack.fits")
             ][0]
-            with pf.open(self.file_path) as hdul:
-                header = hdul[0].header
-                n_grism = len(self._root().filter_names)
-                n_pa = len(self._root().PAs)
-                self.beam_frame_list = []
-                extver_list = []
-                for i in range(n_grism):
-                    try:
-                        grism_name = self._root().filter_names[::-1][i]
-                        extver = grism_name + f",{self.PA}"
-                    except:
-                        extver = "none"
-                    extver_list.append(extver)
-                self.beam_single_PA_frame.update_plots(extvers=extver_list)
+
+            extver_list = [s for s in self._root().poss_extvers if self.PA in s]
+            self.beam_single_PA_frame.update_plots(extvers=extver_list)
 
             self.update()
 
@@ -155,18 +144,10 @@ class BeamFrame(ctk.CTkFrame):
             n_pa = np.nanmax(
                 [header[f"N{header[f'GRISM{n:0>3}']}"] for n in range(1, n_grism + 1)]
             )
-            self.beam_frame_list = []
-            row = 0
-            extver_list = []
-            for i in range(n_grism):
-                grism_name = header[f"GRISM{i+1:0>3}"]
-                pa = "," + str(header[f"{grism_name}{row+1:0>2}"])
-                extver = grism_name + pa
-                extver = grism_name + f",{self.PA}"
-                extver_list.append(extver)
-            self.beam_single_PA_frame = SinglePABeamFrame(self, extvers=extver_list)
-            self.beam_single_PA_frame.grid(row=1, column=0, sticky="news")
+            extver_list = [s for s in self._root().poss_extvers if self.PA in s]
 
+            self.beam_single_PA_frame = SinglePABeamFrame(self, extvers= extver_list)
+            self.beam_single_PA_frame.grid(row=1, column=0, sticky="news")
             self.grid_rowconfigure(1, weight=1)
             self.grid_columnconfigure(0, weight=1)
 
@@ -200,14 +181,12 @@ class SinglePABeamFrame(ctk.CTkFrame):
 
         self.check_axes_colours()
 
-        # plt.style.use("dark_background")
-
         self.extvers = extvers
         self.coverage = {}
-        widths = [1 / 3, 1] * len(self.extvers)
+        widths = [1 / 3, 1] * 3
         self.fig_axes = self.fig.subplots(
             4,
-            2 * len(self.extvers),
+            6,
             sharey=True,
             width_ratios=widths,
         )

{pyGCG-0.6.3 → pygcg-0.7.2}/pygcg/tabs/spectrum.py

@@ -70,13 +70,37 @@ class SpecFrame(ctk.CTkFrame):
 
         self.redshift_frame = ctk.CTkFrame(self)
         self.redshift_frame.grid(row=2, column=2, sticky="news")
-        self.redshift_frame.columnconfigure([0, 1], weight=1)
+        self.redshift_frame.columnconfigure([0, 1, 2, 3, 4, 5], weight=1)
         self.redshift_label = ctk.CTkLabel(
             self.redshift_frame, text="Estimated redshift:"
         )
         self.redshift_label.grid(
             row=0, column=0, columnspan=2, padx=(20, 10), pady=(10,), sticky="w"
         )
+        self.redshift_spec_info = ctk.CTkLabel(
+            self.redshift_frame,
+            text="test",
+        )
+        self.redshift_spec_info.grid(
+            row=0,
+            column=2,
+            columnspan=2,
+            padx=(20, 10),
+            pady=(10,),
+            sticky="we",
+        )
+        self.redshift_phot_info = ctk.CTkLabel(
+            self.redshift_frame,
+            text="test2",
+        )
+        self.redshift_phot_info.grid(
+            row=0,
+            column=4,
+            columnspan=2,
+            padx=(20, 10),
+            pady=(10,),
+            sticky="we",
+        )
         self.current_redshift = ValidateFloatVar(
             master=self,
             value=0,
@@ -88,6 +112,7 @@ class SpecFrame(ctk.CTkFrame):
         self.redshift_entry.grid(
             row=1,
             column=0,
+            columnspan=3,
             padx=(20, 10),
             pady=(10, 0),
             sticky="we",
@@ -103,7 +128,8 @@ class SpecFrame(ctk.CTkFrame):
         )
         self.reset_redshift_button.grid(
             row=1,
-            column=1,
+            column=3,
+            columnspan=3,
             padx=(20, 10),
             pady=(10, 0),
             sticky="we",
@@ -118,32 +144,56 @@ class SpecFrame(ctk.CTkFrame):
         self.redshift_slider.grid(
             row=2,
             column=0,
-            columnspan=2,
+            columnspan=6,
             padx=(20, 10),
             pady=10,
             sticky="we",
         )
 
-        self.z_q_checkbox = ctk.CTkCheckBox(
+        self.z_q_checkbox_un = ctk.CTkCheckBox(
             self.redshift_frame,
-            text="Unreliable redshift",
-            command=self.z_q_update,
+            text="Unreliable z",
+            command=self.z_q_update_un,
+        )
+        self.z_q_checkbox_un.grid(
+            row=3, column=0, columnspan=2, padx=(20, 10), pady=10, sticky="w"
+        )
+
+        self.z_q_checkbox_te = ctk.CTkCheckBox(
+            self.redshift_frame,
+            text="Tentative z",
+            command=self.z_q_update_te,
+        )
+        self.z_q_checkbox_te.grid(
+            row=3, column=2, columnspan=2, padx=(20, 10), pady=10, sticky="w"
         )
-        self.z_q_checkbox.grid(row=3, column=0, padx=(20, 10), pady=10, sticky="w")
 
         self.bad_seg_checkbox = ctk.CTkCheckBox(
             self.redshift_frame,
             text="Bad segmentation map",
             command=self.bad_seg_update,
         )
-        self.bad_seg_checkbox.grid(row=3, column=1, padx=(20, 10), pady=10, sticky="w")
+        self.bad_seg_checkbox.grid(
+            row=3,
+            column=4,
+            columnspan=2,
+            padx=(20, 10),
+            pady=10,
+            sticky="w",
+        )
 
         self.muse_checkbox = ctk.CTkCheckBox(
             self.plot_options_frame,
             text="MUSE spectrum",
             command=self.change_components,
         )
-        self.muse_checkbox.grid(row=0, column=2, padx=20, pady=(10, 10), sticky="w")
+        self.muse_checkbox.grid(
+            row=0,
+            column=2,
+            padx=20,
+            pady=(10, 10),
+            sticky="w",
+        )
         self.grizli_checkbox = ctk.CTkCheckBox(
             self.plot_options_frame,
             text="NIRISS spectrum",
@@ -166,8 +216,13 @@ class SpecFrame(ctk.CTkFrame):
         )
         self.images_frame.grid(row=2, column=0, columnspan=2, sticky="news")
 
-    def z_q_update(self):
-        self._root().current_gal_data["unreliable_redshift"] = self.z_q_checkbox.get()
+    def z_q_update_un(self):
+        self._root().current_gal_data[
+            "unreliable_redshift"
+        ] = self.z_q_checkbox_un.get()
+
+    def z_q_update_te(self):
+        self._root().current_gal_data["tentative_redshift"] = self.z_q_checkbox_te.get()
 
     def bad_seg_update(self):
         self._root().current_gal_data["bad_seg_map"] = self.bad_seg_checkbox.get()
@@ -239,7 +294,7 @@ class SpecFrame(ctk.CTkFrame):
                 Path(self._root().config["files"]["extractions_dir"])
                 .expanduser()
                 .resolve()
-            ).glob(f"*{self._root().seg_id:0>{pad}}.row.fits")
+            ).glob(f"**/*{self._root().seg_id:0>{pad}}.row.fits")
         ][0]
         with pf.open(_row_path) as hdul:
             grizli_redshift = Table(hdul[1].data)["redshift"].value[0]
@@ -252,6 +307,9 @@ class SpecFrame(ctk.CTkFrame):
             self.unreliable_redshift = self._root().current_gal_data.get(
                 "unreliable_redshift", False
             )
+            self.tentative_redshift = self._root().current_gal_data.get(
+                "tentative_redshift", False
+            )
             self.bad_seg = self._root().current_gal_data.get("bad_seg_map", False)
 
             self._root().current_gal_data["grizli_redshift"] = self.grizli_redshift
@@ -261,11 +319,49 @@ class SpecFrame(ctk.CTkFrame):
             self._root().current_gal_data[
                 "unreliable_redshift"
             ] = self.unreliable_redshift
+            self._root().current_gal_data[
+                "tentative_redshift"
+            ] = self.tentative_redshift
             self._root().current_gal_data["bad_seg_map"] = self.bad_seg
             self.current_redshift.set(self.estimated_redshift)
             self.redshift_slider.set(self.estimated_redshift)
-            self.z_q_checkbox.select() if self.unreliable_redshift else self.z_q_checkbox.deselect()
-            self.bad_seg_checkbox.select() if self.bad_seg else self.bad_seg_checkbox.deselect()
+            (
+                self.z_q_checkbox_un.select()
+                if self.unreliable_redshift
+                else self.z_q_checkbox_un.deselect()
+            )
+            (
+                self.z_q_checkbox_te.select()
+                if self.unreliable_redshift
+                else self.z_q_checkbox_te.deselect()
+            )
+            (
+                self.bad_seg_checkbox.select()
+                if self.bad_seg
+                else self.bad_seg_checkbox.deselect()
+            )
+
+        try:
+            phot_z_name = self._root().config.get("catalogue", {}).get("zphot", "zphot")
+            phot_z = self._root().tab_row[phot_z_name]
+            assert phot_z != "--"
+            phot_z_text = f"z\u209a\u2095\u2092\u209c = {phot_z:.3f} "
+        except Exception as e:
+            phot_z_text = "z\u209a\u2095\u2092\u209c = n/a  "
+        self.redshift_phot_info.configure(
+            text=(f"{phot_z_text}"),
+        )
+
+        try:
+            spec_z_name = self._root().config.get("catalogue", {}).get("zspec", "zspec")
+            spec_z = self._root().tab_row[spec_z_name]
+            assert spec_z != "--"
+            spec_z_text = f"z\u209b\u209a\u2091\U0001E03F = {spec_z:.3f} "
+        except Exception as e:
+            spec_z_text = f"z\u209b\u209a\u2091\U0001E03F = n/a  "
+        self.redshift_spec_info.configure(
+            text=(f"{spec_z_text}"),
+        )
 
     def _update_all(self):
         self.check_axes_colours()
@@ -299,7 +395,7 @@ class SpecFrame(ctk.CTkFrame):
                 Path(self._root().config["files"]["extractions_dir"])
                 .expanduser()
                 .resolve()
-            ).glob(f"*{self._root().seg_id:0>{pad}}.1D.fits")
+            ).glob(f"**/*{self._root().seg_id:0>{pad}}.1D.fits")
         ][0]
 
         if templates:
@@ -329,14 +425,16 @@ class SpecFrame(ctk.CTkFrame):
                             data_table["line"][clip] / data_table["flat"][clip] / 1e-19,
                         )
                     except:
-                        (
-                            self.plotted_components[dict_key][hdu.name],
-                        ) = self.fig_axes.plot(
-                            data_table["wave"][clip],
-                            data_table["line"][clip] / data_table["flat"][clip] / 1e-19,
-                            c="red",
-                            alpha=0.7,
-                            zorder=10,
+                        (self.plotted_components[dict_key][hdu.name],) = (
+                            self.fig_axes.plot(
+                                data_table["wave"][clip],
+                                data_table["line"][clip]
+                                / data_table["flat"][clip]
+                                / 1e-19,
+                                c="red",
+                                alpha=0.7,
+                                zorder=10,
+                            )
                         )
                 else:
                     try:
@@ -368,16 +466,16 @@ class SpecFrame(ctk.CTkFrame):
                             yerr=y_err,
                         )
                     except:
-                        self.plotted_components[dict_key][
-                            hdu.name
-                        ] = self.fig_axes.errorbar(
-                            data_table["wave"][clip],
-                            y_vals,
-                            yerr=y_err,
-                            fmt="o",
-                            markersize=3,
-                            ecolor=colors.to_rgba(colours[hdu.name], 0.5),
-                            c=colours[hdu.name],
+                        self.plotted_components[dict_key][hdu.name] = (
+                            self.fig_axes.errorbar(
+                                data_table["wave"][clip],
+                                y_vals,
+                                yerr=y_err,
+                                fmt="o",
+                                markersize=3,
+                                ecolor=colors.to_rgba(colours[hdu.name], 0.5),
+                                c=colours[hdu.name],
+                            )
                         )
                     ymax = np.nanmax([ymax, np.nanmax(y_vals)])
 
@@ -774,7 +872,7 @@ class ImagesFrame(ctk.CTkFrame):
                     Path(self._root().config["files"]["prep_dir"])
                     .expanduser()
                     .resolve()
-                ).glob(f"*{p.lower()}_drz_sci.fits")
+                ).glob(f"*{p.lower()}*_dr[zc]_sci.fits")
             ]
             if len(rgb_path) == 0:
                 print(f"{p} image not found.")
@@ -956,16 +1054,29 @@ class ImagesFrame(ctk.CTkFrame):
 
             for i, v in enumerate(self.rgb_paths):
                 with pf.open(v) as hdul:
+                    try:
+                        zp = hdul[0].header["ZP"]
+                    except:
+                        try:
+                            # PASSAGE
+                            zp = (
+                                -2.5 * np.log10(hdul[0].header["PHOTFLAM"])
+                                - 5 * np.log10(hdul[0].header["PHOTPLAM"])
+                                - 2.408
+                            )
+                        except:
+                            # Dawn JWST products
+                            zp = 28.9
                     self.rgb_data[i] = hdul[0].data[
                         self.cutout_dimensions[0] : self.cutout_dimensions[1],
                         self.cutout_dimensions[2] : self.cutout_dimensions[3],
-                    ] * 10 ** ((hdul[0].header["ZP"] - 25) / 2.5)
+                    ] * 10 ** ((zp - 25) / 2.5)
 
             self.rgb_stretched = make_lupton_rgb(
                 self.rgb_data[0],
                 self.rgb_data[1],
                 self.rgb_data[2],
-                stretch=0.1,  # Q=10
+                stretch=0.2,
             )
             try:
                 self.plotted_components["rgb_img"].set_data(self.rgb_stretched)
@@ -1192,7 +1303,13 @@ class RedshiftPlotFrame(ctk.CTkFrame):
                 Path(self._root().config["files"]["extractions_dir"])
                 .expanduser()
                 .resolve()
-            ).glob(f"*{self._root().seg_id:0>{pad}}.full.fits")
+            ).glob(f"**/*{self._root().seg_id:0>{pad}}.full.fits")
+        ] + [
+            *(
+                Path(self._root().config["files"]["extractions_dir"])
+                .expanduser()
+                .resolve()
+            ).glob(f"**/*{self._root().seg_id:0>{pad}}.maps.fits")
         ]
         if len(self.fits_path) == 0:
             print("Full extraction data not found.")

{pyGCG-0.6.3 → pygcg-0.7.2}/pygcg/utils/toolbar.py

@@ -4,7 +4,6 @@ import customtkinter as ctk
 import numpy as np
 from matplotlib import cbook
 from matplotlib.backend_bases import NavigationToolbar2
-from matplotlib.backends._backend_tk import ToolTip
 from matplotlib.backends.backend_tkagg import NavigationToolbar2Tk
 from PIL import Image
 

{pyGCG-0.6.3 → pygcg-0.7.2}/pygcg/windows/search.py

@@ -54,64 +54,77 @@ class SearchWindow(BaseWindow):
         lines = re.split("\n", text_input.strip())
 
         try:
-            parts = re.split("\s*[,|;|\s]\s*", lines[0].strip())
+            parts = re.split(r"\s*[,|;|\s]\s*", lines[0].strip())
         except Exception as e:
             self.warn_input(f"Could not parse input: {e}")
             return
 
         ras = np.empty(len(lines), dtype=object)
         decs = np.empty_like(ras, dtype=object)
-
-        try:
-            if len(parts) == 3:
-                self.ids_arr = np.empty_like(ras, dtype=object)
-                for i, l in enumerate(lines):
-                    # print(re.split("\s*[,|;|\s]\s*", l.strip()))
-                    self.ids_arr[i], ras[i], decs[i] = re.split(
-                        "\s*[,|;|\s]\s*", l.strip()
-                    )
-
-            elif len(parts) == 2:
-                for i, l in enumerate(lines):
-                    # print(re.split("\s*[,|;|\s]\s*", l.strip()))
-                    ras[i], decs[i] = re.split("\s*[,|;|\s]\s*", l.strip())
-            else:
-                raise ValueError()
-        except Exception as e:
-            self.warn_input(
-                "Could not parse input: input must be either "
-                "two or three components per line."
+        self.ids_arr = np.empty_like(ras, dtype=object)
+
+        if len(parts) == 1:
+            for i, l in enumerate(lines):
+                self.ids_arr[i] = re.split(r"\s*[,|;|\s]\s*", l.strip())[0]
+            self.ids_arr = np.asarray(self.ids_arr)
+            _, _, match_idx = np.intersect1d(
+                np.asarray(self.ids_arr), self._root().id_col, return_indices=True
             )
-            return
 
-        try:
-            new_coords = SkyCoord(ras.astype(float) * u.deg, decs.astype(float) * u.deg)
-        except Exception as e:
+        else:
+            try:
+
+                if len(parts) == 3:
+                    # self.ids_arr = np.empty_like(ras, dtype=object)
+                    for i, l in enumerate(lines):
+                        # print(re.split("\s*[,|;|\s]\s*", l.strip()))
+                        self.ids_arr[i], ras[i], decs[i] = re.split(
+                            r"\s*[,|;|\s]\s*", l.strip()
+                        )
+
+                elif len(parts) == 2:
+                    for i, l in enumerate(lines):
+                        # print(re.split("\s*[,|;|\s]\s*", l.strip()))
+                        ras[i], decs[i] = re.split(r"\s*[,|;|\s]\s*", l.strip())
+                else:
+                    raise ValueError()
+            except Exception as e:
+                self.warn_input(
+                    "Could not parse input: input must be either "
+                    "two or three components per line."
+                )
+                return
+
             try:
-                new_coords = SkyCoord(ras, decs)
+                new_coords = SkyCoord(
+                    ras.astype(float) * u.deg, decs.astype(float) * u.deg
+                )
             except Exception as e:
                 try:
-                    new_coords = SkyCoord(ras, decs, unit=(u.hourangle, u.deg))
+                    new_coords = SkyCoord(ras, decs)
                 except Exception as e:
-                    self.warn_input(f"Could not parse input coordinates: {e}")
-                    return
-
-        sky_match_idx, dist, _ = new_coords.match_to_catalog_sky(
-            self._root().sky_coords
-        )
+                    try:
+                        new_coords = SkyCoord(ras, decs, unit=(u.hourangle, u.deg))
+                    except Exception as e:
+                        self.warn_input(f"Could not parse input coordinates: {e}")
+                        return
+
+            sky_match_idx, dist, _ = new_coords.match_to_catalog_sky(
+                self._root().sky_coords
+            )
 
-        sky_match_idx = sky_match_idx[
-            dist <= float(self.search_radius.get()) * u.arcsec
-        ]
-        if hasattr(self, "ids_arr"):
-            self.ids_arr = self.ids_arr[
+            sky_match_idx = sky_match_idx[
                 dist <= float(self.search_radius.get()) * u.arcsec
             ]
-
-        _, unique_idx = np.unique(sky_match_idx, return_index=True)
-        match_idx = sky_match_idx[np.sort(unique_idx)]
-        if hasattr(self, "ids_arr"):
-            self.ids_arr = self.ids_arr[np.sort(unique_idx)]
+            if hasattr(self, "ids_arr"):
+                self.ids_arr = self.ids_arr[
+                    dist <= float(self.search_radius.get()) * u.arcsec
+                ]
+
+            _, unique_idx = np.unique(sky_match_idx, return_index=True)
+            match_idx = sky_match_idx[np.sort(unique_idx)]
+            if hasattr(self, "ids_arr"):
+                self.ids_arr = self.ids_arr[np.sort(unique_idx)]
 
         if len(match_idx) == 0:
             self.warn_input("No matches found!")

{pyGCG-0.6.3 → pygcg-0.7.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyGCG"
-version = "0.6.3"
+version = "0.7.2"
 authors = [
   { name="Peter Watson", email="peter.watson+pygcg@inaf.it" },
 ]