AstroToolkit 1.5.0__tar.gz → 1.5.1__tar.gz

{astrotoolkit-1.5.0 → astrotoolkit-1.5.1}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: AstroToolkit
-Version: 1.5.0
+Version: 1.5.1
 Summary: A package for the gathering and plotting of astronomical data.
 Author-email: Ethan Moorfield <ethan.moorfield@hotmail.co.uk>
 Project-URL: Homepage, https://github.com/WD-planets/AstroToolkit
 Project-URL: Issues, https://github.com/WD-planets/AstroToolkit/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: astropy==6.0.1
@@ -21,6 +21,7 @@ Requires-Dist: pandas==2.2.2
 Requires-Dist: Requests==2.31.0
 Requires-Dist: beautifulsoup4==4.12.3
 Requires-Dist: scipy==1.13.0
+Requires-Dist: selenium==4.21.0
 
 # AstroToolkit
 
@@ -49,6 +50,7 @@ AstroToolkit (ATK) is a set of tools for fetching, plotting, and analysing astro
     * [Spectrum Query](#spectrumquery)
     * [SED Query](#sedquery)
     * [HRD Query](#hrdquery)
+    * [Reddening Query](#reddeningquery)
 * [Proper Motion Correction](#correctpm)
 * [Local File Saving](#savedata)
 * [Local File Reading](#readdata)
@@ -499,10 +501,13 @@ Arguments:
              - 'powspec' - Lomb-Scargle power spectrum
              - 'phase' - phase folded light curve using Lomb-Scargle
 
-Additional Arguments (only valid light curve plots):
+Additional Arguments:
+For lightcurve plots:
  - colours: list = colour to plot each band that returned data. Defaults to black for all bands.
  - bands: list = bands to include. Includes all by default.
 
+For phase fold plots:
+- freq: float = frequency on which to fold the lightcurve data. If none is given, it will be folded on the peak Lomb-Scargle frequency.
 ```
 
 ```
@@ -855,6 +860,81 @@ save() - saves the plot created by the plot() method to local storage.
 
 <br>
 
+#### 1.9. reddening query<a id="reddeningquery"></a>
+
+**Additional Parameters:**
+
+```
+survey: str = target survey
+              Can be one of:
+               - 'stilism'
+               - 'gdre'
+```
+
+```
+!radius: int = search radius in arcseconds
+```
+
+Additionally, requires one of:
+
+```
+pos: list = [right ascension (deg), declination (deg)], target position
+```
+
+```
+source: int = Gaia DR3 source_id.
+              Target Gaia DR3 source
+```
+
+**Note:** For stilism queries, source input is required as a parallax is needed for distance calculations.
+
+**Returns:**
+
+```
+DataStruct: class = ATK Data Structure
+```
+
+*Attributes:*
+
+```
+kind: str = 'data'
+```
+
+```
+subkind: str = kind of query (as listed above)
+```
+
+```
+survey: str = target survey of query
+```
+
+```
+catalogue: str = None
+```
+
+```
+source: int = target Gaia DR3 source
+```
+
+```
+pos: list = target position 
+```
+
+```
+identifier: str = positional identifier of target in format JHHMMSS.SS±DDMMSS.SS
+```
+
+```
+data: dict = returned data, where:
+             keys: str = column headers
+             values : float = column values
+```
+
+*Methods:*
+None
+
+<br>
+
 ### 2. correctpm<a id="correctpm"></a>
 
 Automatically corrects for proper motion between two surveys or two times for a given Gaia DR3 source *or* position if proper motion measurements also provided.

astrotoolkit-1.5.0/src/AstroToolkit.egg-info/PKG-INFO → astrotoolkit-1.5.1/README.md

@@ -1,27 +1,3 @@
-Metadata-Version: 2.1
-Name: AstroToolkit
-Version: 1.5.0
-Summary: A package for the gathering and plotting of astronomical data.
-Author-email: Ethan Moorfield <ethan.moorfield@hotmail.co.uk>
-Project-URL: Homepage, https://github.com/WD-planets/AstroToolkit
-Project-URL: Issues, https://github.com/WD-planets/AstroToolkit/issues
-Classifier: Programming Language :: Python :: 3
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: astropy==6.0.1
-Requires-Dist: astroquery==0.4.7
-Requires-Dist: bokeh==3.4.1
-Requires-Dist: cmasher==1.8.0
-Requires-Dist: matplotlib==3.8.4
-Requires-Dist: importlib_resources==6.4.0
-Requires-Dist: numpy==1.26.4
-Requires-Dist: pandas==2.2.2
-Requires-Dist: Requests==2.31.0
-Requires-Dist: beautifulsoup4==4.12.3
-Requires-Dist: scipy==1.13.0
-
 # AstroToolkit
 
 AstroToolkit (ATK) is a set of tools for fetching, plotting, and analysing astronomical data.
@@ -49,6 +25,7 @@ AstroToolkit (ATK) is a set of tools for fetching, plotting, and analysing astro
     * [Spectrum Query](#spectrumquery)
     * [SED Query](#sedquery)
     * [HRD Query](#hrdquery)
+    * [Reddening Query](#reddeningquery)
 * [Proper Motion Correction](#correctpm)
 * [Local File Saving](#savedata)
 * [Local File Reading](#readdata)
@@ -499,10 +476,13 @@ Arguments:
              - 'powspec' - Lomb-Scargle power spectrum
              - 'phase' - phase folded light curve using Lomb-Scargle
 
-Additional Arguments (only valid light curve plots):
+Additional Arguments:
+For lightcurve plots:
  - colours: list = colour to plot each band that returned data. Defaults to black for all bands.
  - bands: list = bands to include. Includes all by default.
 
+For phase fold plots:
+- freq: float = frequency on which to fold the lightcurve data. If none is given, it will be folded on the peak Lomb-Scargle frequency.
 ```
 
 ```
@@ -855,6 +835,81 @@ save() - saves the plot created by the plot() method to local storage.
 
 <br>
 
+#### 1.9. reddening query<a id="reddeningquery"></a>
+
+**Additional Parameters:**
+
+```
+survey: str = target survey
+              Can be one of:
+               - 'stilism'
+               - 'gdre'
+```
+
+```
+!radius: int = search radius in arcseconds
+```
+
+Additionally, requires one of:
+
+```
+pos: list = [right ascension (deg), declination (deg)], target position
+```
+
+```
+source: int = Gaia DR3 source_id.
+              Target Gaia DR3 source
+```
+
+**Note:** For stilism queries, source input is required as a parallax is needed for distance calculations.
+
+**Returns:**
+
+```
+DataStruct: class = ATK Data Structure
+```
+
+*Attributes:*
+
+```
+kind: str = 'data'
+```
+
+```
+subkind: str = kind of query (as listed above)
+```
+
+```
+survey: str = target survey of query
+```
+
+```
+catalogue: str = None
+```
+
+```
+source: int = target Gaia DR3 source
+```
+
+```
+pos: list = target position 
+```
+
+```
+identifier: str = positional identifier of target in format JHHMMSS.SS±DDMMSS.SS
+```
+
+```
+data: dict = returned data, where:
+             keys: str = column headers
+             values : float = column values
+```
+
+*Methods:*
+None
+
+<br>
+
 ### 2. correctpm<a id="correctpm"></a>
 
 Automatically corrects for proper motion between two surveys or two times for a given Gaia DR3 source *or* position if proper motion measurements also provided.

{astrotoolkit-1.5.0 → astrotoolkit-1.5.1}/pyproject.toml

@@ -7,13 +7,13 @@ include-package-data = true
 
 [project]
 name = "AstroToolkit"
-version = "1.5.0"
+version = "1.5.1"
 authors = [
   { name="Ethan Moorfield", email="ethan.moorfield@hotmail.co.uk"},
 ]
 description = "A package for the gathering and plotting of astronomical data."
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.11"
 classifiers = [
     "Programming Language :: Python :: 3",
     "Operating System :: OS Independent",
@@ -30,6 +30,7 @@ dependencies = [
     "Requests==2.31.0",
     "beautifulsoup4==4.12.3",
     "scipy==1.13.0",
+    "selenium==4.21.0",
 ]
 
 [project.urls]

{astrotoolkit-1.5.0 → astrotoolkit-1.5.1}/src/AstroToolkit/Data/dataquery.py

@@ -35,7 +35,7 @@ class SurveyInfo:
             "gaia": [2016, 0],
             "panstarrs": [2012, 0],
             "skymapper": [2016, 0],
-            "galex": [2007, 0],
+            "galex": [2006, 8],
             "rosat": [1991, 0],
             "sdss": [2017, 0],
             "wise": [2010, 5],
@@ -278,7 +278,7 @@ class SurveyInfo:
                 "overlay_type": "detection_mag",
                 "ra_name": "ra",
                 "dec_name": "dec",
-                "colours": ["green", "blue", "red"],
+                "colours": ["limegreen", "blue", "red"],
                 "default_overlay_mag": "phot_g_mean_mag",
             },
             "galex": {

{astrotoolkit-1.5.0 → astrotoolkit-1.5.1}/src/AstroToolkit/Data/fetch_crts.py

@@ -11,7 +11,7 @@ from bs4 import BeautifulSoup as bs
 from importlib_resources import files
 from numpy import extract, genfromtxt
 
-TIMER = files("AstroToolkit.Settings").joinpath("CRTS_TIMER.txt")
+TIMER = files("AstroToolkit.Configuration").joinpath("CRTS_TIMER.txt")
 
 if not os.path.isfile(str(TIMER)):
     with open(str(TIMER), "w") as timer:
@@ -23,7 +23,7 @@ if not os.path.isfile(str(TIMER)):
 def get_CRTS_lightcurve(pos, radius):
     ra, dec = pos[0], pos[1]
 
-    survey_radius = int(radius/60)
+    survey_radius = int(radius / 60)
 
     with open(str(TIMER), "r") as timer:
         prev_query_time = timer.readline().split(":")

{astrotoolkit-1.5.0 → astrotoolkit-1.5.1}/src/AstroToolkit/Data/imageoverlay.py

@@ -82,9 +82,10 @@ class OverlayData(object):
                     self.returned_data["non_gaia"][f"{mag}_marker_size"].append(
                         (
                             half_image_size / 50
-                            + (half_image_size / 75) ** radius_multiplier
+                            + (half_image_size / 75) ** (radius_multiplier * 1.15)
                         )
                         * base_marker_size
+                        + 0.0005
                     )
                 else:
                     self.returned_data["non_gaia"][f"{mag}_marker_size"].append(None)

{astrotoolkit-1.5.0 → astrotoolkit-1.5.1}/src/AstroToolkit/Data/lightcurvequery.py

@@ -12,10 +12,10 @@ class LightcurveStruct(object):
     def __str__(self):
         return "<ATK Lightcurve Structure>"
 
-    def plot(self, kind="lightcurve", colours=None, bands=None):
+    def plot(self, kind="lightcurve", colours=None, bands=None, freq=None):
         from ..Plotting.plotmap import map_to_plot
 
-        return map_to_plot(self, kind, colours, bands)
+        return map_to_plot(self, kind=kind, colours=colours, bands=bands, freq=freq)
 
     def sigmaclip(self, sigma=3):
         from .sigmaclip import sigma_clip
@@ -74,7 +74,7 @@ class ZtfQuery(GeneralQuery):
 
         data = pd.read_csv(BytesIO(response.content))
         if len(data) == 0:
-            print("Note: {self.survey} query returned no data.")
+            print(f"Note: {self.survey} query returned no data.")
             return None
 
         return data
@@ -142,7 +142,9 @@ class AtlasQuery(GeneralQuery):
             headers = {"Authorization": f"Token {token}", "Accept": "application/json"}
             self.headers = headers
         else:
-            print(f"Note: experiencing issues with {self.survey}.")
+            print(
+                f"Note: experiencing issues with {self.survey}. Please ensure that you have provided valid login credentials."
+            )
             return None
 
         do_correction = False
@@ -159,7 +161,7 @@ class AtlasQuery(GeneralQuery):
                         data={
                             "ra": self.pos[0],
                             "dec": self.pos[1],
-                            "mjd_min": 60096.0,
+                            "mjd_min": 50000.0,
                             "propermotion_ra": self.pmra,
                             "propermotion_dec": self.pmdec,
                             "radec_epoch_year": 2000,
@@ -173,7 +175,7 @@ class AtlasQuery(GeneralQuery):
                         data={
                             "ra": self.pos[0],
                             "dec": self.pos[1],
-                            "mjd_min": 60096.0,
+                            "mjd_min": 50000.0,
                             "radec_epoch_year": 2000,
                             "use_reduced": True,
                         },
@@ -198,7 +200,7 @@ class AtlasQuery(GeneralQuery):
                         time.sleep(waittime)
                 else:
                     print(
-                        f"{self.survey} login failed. Please ensure that you have provided valid credentials."
+                        f"{self.survey} login failed. Please ensure that you have provided valid login credentials."
                     )
                     return None
 
@@ -254,8 +256,6 @@ class AtlasQuery(GeneralQuery):
             data["duJy"].tolist(),
         )
 
-        # chi > 100
-        bad_indices_chi = set([i for i, element in enumerate(chi_arr) if element > 100])
         # abs(flux) < 3
         bad_indices_flux = set(
             [i for i, element in enumerate(flux) if abs(element) < 3]
@@ -273,14 +273,18 @@ class AtlasQuery(GeneralQuery):
             ]
         )
 
+        bad_indices_mag_hard_lim = set(
+            [i for i, element in enumerate(mag_err) if element > 0.5]
+        )
+
         bad_indices = list(
             set(
                 itertools.chain(
                     *[
-                        bad_indices_chi,
                         bad_indices_flux,
                         bad_indices_flux_err,
                         bad_indices_mag,
+                        bad_indices_mag_hard_lim,
                     ]
                 )
             )
@@ -294,6 +298,22 @@ class AtlasQuery(GeneralQuery):
             )
         obs_arr, mag, mag_err, mjd, mjd_ori, ra_arr, dec_arr = filtered_list
 
+        filtered_list = []
+        mask = [i for i, val in enumerate(mag) if val < 0]
+        for _, val in enumerate([obs_arr, mag, mag_err, mjd, mjd_ori, ra_arr, dec_arr]):
+            filtered_list.append(
+                [element for i, element in enumerate(val) if i not in mask]
+            )
+        obs_arr, mag, mag_err, mjd, mjd_ori, ra_arr, dec_arr = filtered_list
+
+        filtered_list = []
+        mask = [i for i, val in enumerate(mag_err) if val == 0]
+        for _, val in enumerate([obs_arr, mag, mag_err, mjd, mjd_ori, ra_arr, dec_arr]):
+            filtered_list.append(
+                [element for i, element in enumerate(val) if i not in mask]
+            )
+        obs_arr, mag, mag_err, mjd, mjd_ori, ra_arr, dec_arr = filtered_list
+
         # split data into bands
         data_split = []
         for band in ["o", "c", "i"]:
@@ -440,6 +460,116 @@ class GaiaQuery(GeneralQuery):
         return data_arr
 
 
+class GaiaQuery(GeneralQuery):
+    def get_data(self, source=None, pos=None):
+        from ..Tools import query
+
+        data = query(
+            survey="gaia_lc",
+            kind="data",
+            pos=pos,
+            source=source,
+            radius=self.radius,
+            level="internal",
+        )
+        if data:
+            return data.data
+
+    def format_data(self, data):
+        import math
+
+        import numpy as np
+        from astropy.time import Time
+
+        # magnitude error formula taken from https://astronomy.stackexchange.com/questions/38371/how-can-i-calculate-the-uncertainties-in-magnitude-like-the-cds-does
+        bands = ["g", "bp", "rp"]
+        cols = []
+
+        data_arr = []
+        for band in bands:
+            if band == "g":
+                # time, flux, flux_err, mag
+                cols = [
+                    "_tab8_5",
+                    "_tab8_6",
+                    "_tab8_7",
+                    "_tab8_9",
+                    "RA_ICRS",
+                    "DE_ICRS",
+                ]
+            elif band == "bp":
+                # time, flux, flux_err, mag
+                cols = [
+                    "_tab8_11",
+                    "_tab8_12",
+                    "_tab8_13",
+                    "_tab8_15",
+                    "RA_ICRS",
+                    "DE_ICRS",
+                ]
+            elif band == "rp":
+                # time, flux, flux_err, mag
+                cols = [
+                    "_tab8_16",
+                    "_tab8_17",
+                    "_tab8_18",
+                    "_tab8_20",
+                    "RA_ICRS",
+                    "DE_ICRS",
+                ]
+
+            time, flux, flux_err, mag, ra, dec = (
+                data[cols[0]],
+                data[cols[1]],
+                data[cols[2]],
+                data[cols[3]],
+                data[cols[4]],
+                data[cols[5]],
+            )
+
+            mag_err = [(2.5 / np.log(10)) * (f_e / f) for f, f_e in zip(flux, flux_err)]
+
+            bad_indices = [i for i, val in enumerate(time) if math.isnan(val)]
+
+            # apply the above filter
+            filtered_list = []
+            for _, val in enumerate([mag, mag_err, time, ra, dec]):
+                filtered_list.append(
+                    [element for i, element in enumerate(val) if i not in bad_indices]
+                )
+            mag, mag_err, time, ra, dec = filtered_list
+
+            mjd_ori = [Time(t + 2455197.5, format="jd").value for t in time]
+            mjd = [t - min(mjd_ori) for t in mjd_ori]
+
+            if len(mag) > 0:
+                data_arr.append(
+                    {
+                        "band": band,
+                        "ra": ra,
+                        "dec": dec,
+                        "mjd": mjd,
+                        "mjd_ori": mjd_ori,
+                        "mag": mag,
+                        "mag_err": mag_err,
+                    }
+                )
+            else:
+                data_arr.append(
+                    {
+                        "band": band,
+                        "ra": None,
+                        "dec": None,
+                        "mjd": None,
+                        "mjd_ori": None,
+                        "mag": None,
+                        "mag_err": None,
+                    }
+                )
+
+        return data_arr
+
+
 class AsassnQuery(GeneralQuery):
     def set_url(self):
         url = f"https://asas-sn.osu.edu/photometry.json?action=index&controller=photometry&dec={self.pos[1]}&epochs_max=&epochs_min=&ra={self.pos[0]}&radius={self.radius/60}&rms_max=&rms_min=&sort_by=raj2000&utf8=%E2%9C%93&vmag_max=&vmag_min="
@@ -452,7 +582,8 @@ class AsassnQuery(GeneralQuery):
         if data["count"] > 1:
             print(f"Note: {self.survey} query returned data for multiple objects")
         elif data["count"] == 0:
-            print(f"Note: experiencing issues with {self.survey}")
+            print("Note: asassn query returned no data.")
+            return None
 
         return data
 
@@ -657,7 +788,7 @@ def query(survey, source, pos, radius, username=None, password=None):
     pmra, pmdec = None, None
     if source and survey != "atlas":
         from ..Tools import correctpm
-        
+
         pos = correctpm(source=source, target_survey=survey)
         if not pos:
             return f_return

{astrotoolkit-1.5.0 → astrotoolkit-1.5.1}/src/AstroToolkit/Input/input_validation.py

@@ -542,7 +542,7 @@ class ValidateReadfitsInput(InputObject):
             if val and val != "config":
                 if key == "fname":
                     self.input[key] = check_string(val)
-                if key == "columns":
+                elif key == "columns":
                     if isinstance(val, list):
                         for i, col in enumerate(val):
                             val[i] = check_string(col)

{astrotoolkit-1.5.0 → astrotoolkit-1.5.1}/src/AstroToolkit/Misc/coordinate_conversions.py

@@ -4,6 +4,11 @@ def conv_hms_to_deg(pos):
     elif "-" in pos:
         separator = "-"
 
+    pos = pos.replace(" ", "")
+    pos = pos.lower()
+    if pos.startswith("j"):
+        pos = pos.lstrip("j")
+
     ra, dec = pos.split(separator)[0], pos.split(separator)[1]
 
     h, m, s = float(ra[0:2]), float(ra[2:4]), float(ra[4:])

{astrotoolkit-1.5.0 → astrotoolkit-1.5.1}/src/AstroToolkit/Plotting/plotmap.py

@@ -5,7 +5,13 @@ class Dimensions(object):
 
 
 def map_to_plot(
-    struct, kind=None, colours=None, bands=None, spectrum_overlay=False, survey=None
+    struct,
+    kind=None,
+    colours=None,
+    bands=None,
+    spectrum_overlay=False,
+    survey=None,
+    freq=None,
 ):
     if not struct.data:
         print("Note: Plot() missing data, suggests that no data was returned")
@@ -24,12 +30,12 @@ def map_to_plot(
             elif kind == "powspec":
                 from ..Timeseries.lomb_scargle import lomb_scargle
 
-                plot = lomb_scargle(struct.data).powspec_plot
+                plot = lomb_scargle(struct.data, freq).powspec_plot
                 dimensions = Dimensions(height=1, width=1)
             elif kind == "phase":
                 from ..Timeseries.lomb_scargle import lomb_scargle
 
-                plot = lomb_scargle(struct.data).phasefold_plot
+                plot = lomb_scargle(struct.data, freq).phasefold_plot
                 dimensions = Dimensions(height=1, width=1)
             else:
                 raise Exception("Invalid plotting kind for ATK Lightcurve data.")
@@ -69,6 +75,7 @@ def map_to_plot(
         config.read_config()
         plot.width = int(config.unit_size) * dimensions.width
         plot.height = int(config.unit_size) * dimensions.height
+        plot.output_backend = "svg"
 
     if hasattr(struct, "subkind"):
         suffix = struct.subkind

{astrotoolkit-1.5.0 → astrotoolkit-1.5.1}/src/AstroToolkit/Plotting/sedplotting.py

@@ -1,7 +1,7 @@
 import math
 
 from bokeh import events
-from bokeh.models import CustomJS, PrintfTickFormatter
+from bokeh.models import CustomJS, NumeralTickFormatter, PrintfTickFormatter
 from bokeh.plotting import figure
 
 
@@ -88,8 +88,6 @@ def plot_sed(struct, spectrum_overlay, survey):
 
             legend_exists = True
 
-    plot.xaxis.formatter = PrintfTickFormatter(format="%0e")
-
     if legend_exists:
         plot.legend.click_policy = "hide"
 

{astrotoolkit-1.5.0 → astrotoolkit-1.5.1}/src/AstroToolkit/Plotting/spectrumplotting.py

@@ -57,12 +57,14 @@ def get_overlay():
 def plot_spectrum(struct):
     x, y = struct.data["wavelength"], struct.data["flux"]
 
+    y = [i * pow(10, 16) for i in y]
+
     plot = figure(
         width=400,
         height=400,
         title=f"{struct.survey} Spectrum",
         x_axis_label=r"\[\lambda\text{ }[\text{AA}]\]",
-        y_axis_label=r"\[\text{flux [erg}\text{ cm }^{-2}\text{ s }^{-1}\text{AA}^{-1}]\]",
+        y_axis_label=r"\[\text{flux [}10^{-16}\text{ erg}\text{ cm }^{-2}\text{ s }^{-1}\text{AA}^{-1}]\]",
     )
 
     plot.line(x, y, color="black", line_width=1)
@@ -90,6 +92,7 @@ def plot_spectrum(struct):
                 y=[y_min, y_max],
                 color=colours[index],
                 legend_label=element["label"],
+                level="underlay",
             )
             if annotation:
                 annotation_height = max(y) + (
@@ -100,7 +103,7 @@ def plot_spectrum(struct):
                     y=annotation_height,
                     x_offset=2,
                     text=annotation,
-                    text_font_size="10pt",
+                    text_font_size="12pt",
                 )
 
                 plot.add_layout(label)
@@ -111,8 +114,6 @@ def plot_spectrum(struct):
                     CustomJS(args=dict(ls=label), code="ls.visible = cb_obj.visible;"),
                 )
 
-    plot.yaxis[0].formatter = PrintfTickFormatter(format="%0.1e")
-
     toggle_legend_js = CustomJS(
         args=dict(leg=plot.legend[0]),
         code="""

{astrotoolkit-1.5.0 → astrotoolkit-1.5.1}/src/AstroToolkit/Timeseries/lomb_scargle.py

@@ -8,14 +8,15 @@ from bokeh.plotting import figure
 newline = "\n"
 
 
-def lomb_scargle(data):
+def lomb_scargle(data, freq=None):
     class timeseries_data(object):
-        def __init__(self, time, mag, mag_err, power, frequency):
+        def __init__(self, time, mag, mag_err, power, frequency, freq):
             self.time = time
             self.mag = mag
             self.mag_err = mag_err
             self.power = power
             self.frequency = frequency
+            self.phase_freq = freq
 
         @property
         def powspec_plot(self):
@@ -32,7 +33,7 @@ def lomb_scargle(data):
             plot.line(
                 x=self.frequency,
                 y=self.power,
-                legend_label=f"Max Frequency: {round(max_freq.value,2)} 1/d {newline}Period: {round(period.value,2)}",
+                legend_label=f"Max Frequency: {round(max_freq.value,2)} 1/d {newline}Period: {round(period.value,2)} h",
             )
 
             toggle_legend_js = CustomJS(
@@ -48,11 +49,15 @@ def lomb_scargle(data):
             )
 
             plot.js_on_event(events.DoubleTap, toggle_legend_js)
+
             return plot
 
         @property
         def phasefold_plot(self):
-            best_frequency = self.frequency[np.nanargmax(self.power)]
+            if not self.phase_freq:
+                best_frequency = self.frequency[np.nanargmax(self.power)]
+            else:
+                best_frequency = self.phase_freq / u.day
 
             t_fit = np.linspace(0, 1, 1000) * u.day
             ls = LombScargle(self.time, self.mag, self.mag_err)
@@ -108,6 +113,20 @@ def lomb_scargle(data):
 
             plot.y_range.flipped = True
 
+            toggle_legend_js = CustomJS(
+                args=dict(leg=plot.legend[0]),
+                code="""
+                    if (leg.visible) {
+                        leg.visible = false
+                        }
+                    else {
+                        leg.visible = true
+                    }
+            """,
+            )
+
+            plot.js_on_event(events.DoubleTap, toggle_legend_js)
+
             return plot
 
     if not data:
@@ -124,6 +143,6 @@ def lomb_scargle(data):
     freqs = np.linspace(0, 15, 150000) / u.day
     power = LombScargle(time, mag, mag_err, fit_mean=False).power(freqs)
 
-    data_class = timeseries_data(time, mag, mag_err, power, freqs)
+    data_class = timeseries_data(time, mag, mag_err, power, freqs, freq)
 
     return data_class

{astrotoolkit-1.5.0 → astrotoolkit-1.5.1}/src/AstroToolkit/Tools.py

@@ -2,18 +2,13 @@ from .Configuration.baseconfig import ConfigStruct
 
 """
 Changelog:
-- Rewritten toolkit in semi-object oriented structure, should help make future development much easier
-- All returned data is now returned in ATK objects rather than dicts, allows for methods such as the plot() method to be attached to the object itself.
-- All data queries now use Vizier. Increases completeness of eROSITA survey due to an unfixable bug with the URL querying method
-- Can now enter any Vizier survey ID in data queries, allows access to all data through Vizier.
-- Improved correctpm
-        - can now correct between surveys supported by the toolkit, as well as any custom input/target times
-        - can also automatically correct the coordinates of a Gaia source to any target time
-- added support for a new reddening query tool: https://irsa.ipac.caltech.edu/applications/DUST/
-- imaging overlays now support all bands from all supported surveys, and these can be chosen from
-- Removed aov timeseries tools, replaced with Lomb-Scargle periodogram/phase folding routines. Removes need for any 3rd party dependencies.
-- significant improvements to package configuration options
-- all ATK data structures now supported for local file saving/loading
+- fixed bug with CRTS light curve queries
+- Can now choose a frequency to plot in phase folded light curves
+- fixed a bug in input checking that made readfits unusable
+- fixed ATLAS light curve queries, extended MJD
+- changed GALEX time from [2007,0] to [2006,8], seems to fit high PM object detections better.
+- other bug fixes
+- added reddening to README, forgot in last version
 """
 
 """
@@ -21,6 +16,15 @@ To-Do:
 - fix (especially tracer) query radius in overlays
 - update README
 - input validation for config values
+- add "features" list to README
+- add support for selecting a section of light curve to include in peridogram etc.
+- add check for missing data in savedata
+- currently, incorrect username/password in ATLAS just says experiencing issues
+- allow user to choose a file name to save file as
+- check atlas query + powspec
+- add piggyback radius to config for image detection overlays
+- add a config option for font size
+- add a config option for svg/png output
 """
 
 config = ConfigStruct()
@@ -162,6 +166,7 @@ def query(
                 source=source,
                 overlays=overlays,
             )
+
     elif kind == "lightcurve":
         from .Data.lightcurvequery import query as lightcurve_query
 
@@ -173,6 +178,7 @@ def query(
             username=username,
             password=password,
         )
+
     elif kind == "phot":
         from .Data.photquery import query as phot_query
 
@@ -204,6 +210,8 @@ def query(
             if gaia_data.data:
                 ra, dec = gaia_data.data["ra2000"][0], gaia_data.data["dec2000"][0]
                 data.identifier = identifier_from_pos([ra, dec])
+        else:
+            data.identifier = identifier_from_pos(data.pos)
     elif hasattr(data, "sources") and data.data:
         identifiers = []
         for source in data.sources:

astrotoolkit-1.5.0/README.md → astrotoolkit-1.5.1/src/AstroToolkit.egg-info/PKG-INFO

@@ -1,3 +1,28 @@
+Metadata-Version: 2.1
+Name: AstroToolkit
+Version: 1.5.1
+Summary: A package for the gathering and plotting of astronomical data.
+Author-email: Ethan Moorfield <ethan.moorfield@hotmail.co.uk>
+Project-URL: Homepage, https://github.com/WD-planets/AstroToolkit
+Project-URL: Issues, https://github.com/WD-planets/AstroToolkit/issues
+Classifier: Programming Language :: Python :: 3
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: astropy==6.0.1
+Requires-Dist: astroquery==0.4.7
+Requires-Dist: bokeh==3.4.1
+Requires-Dist: cmasher==1.8.0
+Requires-Dist: matplotlib==3.8.4
+Requires-Dist: importlib_resources==6.4.0
+Requires-Dist: numpy==1.26.4
+Requires-Dist: pandas==2.2.2
+Requires-Dist: Requests==2.31.0
+Requires-Dist: beautifulsoup4==4.12.3
+Requires-Dist: scipy==1.13.0
+Requires-Dist: selenium==4.21.0
+
 # AstroToolkit
 
 AstroToolkit (ATK) is a set of tools for fetching, plotting, and analysing astronomical data.
@@ -25,6 +50,7 @@ AstroToolkit (ATK) is a set of tools for fetching, plotting, and analysing astro
     * [Spectrum Query](#spectrumquery)
     * [SED Query](#sedquery)
     * [HRD Query](#hrdquery)
+    * [Reddening Query](#reddeningquery)
 * [Proper Motion Correction](#correctpm)
 * [Local File Saving](#savedata)
 * [Local File Reading](#readdata)
@@ -475,10 +501,13 @@ Arguments:
              - 'powspec' - Lomb-Scargle power spectrum
              - 'phase' - phase folded light curve using Lomb-Scargle
 
-Additional Arguments (only valid light curve plots):
+Additional Arguments:
+For lightcurve plots:
  - colours: list = colour to plot each band that returned data. Defaults to black for all bands.
  - bands: list = bands to include. Includes all by default.
 
+For phase fold plots:
+- freq: float = frequency on which to fold the lightcurve data. If none is given, it will be folded on the peak Lomb-Scargle frequency.
 ```
 
 ```
@@ -831,6 +860,81 @@ save() - saves the plot created by the plot() method to local storage.
 
 <br>
 
+#### 1.9. reddening query<a id="reddeningquery"></a>
+
+**Additional Parameters:**
+
+```
+survey: str = target survey
+              Can be one of:
+               - 'stilism'
+               - 'gdre'
+```
+
+```
+!radius: int = search radius in arcseconds
+```
+
+Additionally, requires one of:
+
+```
+pos: list = [right ascension (deg), declination (deg)], target position
+```
+
+```
+source: int = Gaia DR3 source_id.
+              Target Gaia DR3 source
+```
+
+**Note:** For stilism queries, source input is required as a parallax is needed for distance calculations.
+
+**Returns:**
+
+```
+DataStruct: class = ATK Data Structure
+```
+
+*Attributes:*
+
+```
+kind: str = 'data'
+```
+
+```
+subkind: str = kind of query (as listed above)
+```
+
+```
+survey: str = target survey of query
+```
+
+```
+catalogue: str = None
+```
+
+```
+source: int = target Gaia DR3 source
+```
+
+```
+pos: list = target position 
+```
+
+```
+identifier: str = positional identifier of target in format JHHMMSS.SS±DDMMSS.SS
+```
+
+```
+data: dict = returned data, where:
+             keys: str = column headers
+             values : float = column values
+```
+
+*Methods:*
+None
+
+<br>
+
 ### 2. correctpm<a id="correctpm"></a>
 
 Automatically corrects for proper motion between two surveys or two times for a given Gaia DR3 source *or* position if proper motion measurements also provided.

{astrotoolkit-1.5.0 → astrotoolkit-1.5.1}/src/AstroToolkit.egg-info/SOURCES.txt

@@ -10,7 +10,6 @@ src/AstroToolkit.egg-info/SOURCES.txt
 src/AstroToolkit.egg-info/dependency_links.txt
 src/AstroToolkit.egg-info/requires.txt
 src/AstroToolkit.egg-info/top_level.txt
-src/AstroToolkit/Configuration/baseconfig.py
 src/AstroToolkit/Data/dataquery.py
 src/AstroToolkit/Data/fetch_crts.py
 src/AstroToolkit/Data/hrdquery.py

{astrotoolkit-1.5.0 → astrotoolkit-1.5.1}/src/AstroToolkit.egg-info/requires.txt

@@ -9,3 +9,4 @@ pandas==2.2.2
 Requests==2.31.0
 beautifulsoup4==4.12.3
 scipy==1.13.0
+selenium==4.21.0

astrotoolkit-1.5.0/src/AstroToolkit/Configuration/baseconfig.py

@@ -1,162 +0,0 @@
-import configparser
-import os
-
-
-class ConfigStruct(object):
-    def __init__(self):
-        from importlib_resources import files
-
-        self.config_file = files("AstroToolkit.Configuration").joinpath("ATKConfig.ini")
-        if not os.path.isfile(self.config_file):
-            print("No ATKConfig.ini found. Making new one with default values\n")
-            self.set_default_config()
-            self.write_config()
-
-    @property
-    def supported_keys(self):
-        keys = []
-        for key, val in vars(self).items():
-            if key != "config_file":
-                keys.append(key)
-        return keys
-
-    def set_default_config(self):
-        from ..Data.dataquery import SurveyInfo
-
-        overlay_info = SurveyInfo().overlay_param_names
-
-        self.enable_notifications = "True"
-        self.query_data_radius = "3"
-        self.query_phot_radius = "3"
-        self.query_bulkphot_radius = "3"
-        self.query_lightcurve_radius = "3"
-        self.query_spectrum_radius = "3"
-        self.query_sed_radius = "3"
-        self.query_reddening_radius = "5"
-        self.query_image_size = "30"
-        self.query_image_overlays = "gaia"
-        self.query_image_band = "g"
-        self.query_lightcurve_atlas_username = "None"
-        self.query_lightcurve_atlas_password = "None"
-        self.unit_size = "400"
-        self.search_radius = "3"
-        self.datapage_search_button_radius = "3"
-        self.gaia_overlay_mag = overlay_info["gaia"]["default_overlay_mag"]
-        self.galex_overlay_mag = overlay_info["galex"]["default_overlay_mag"]
-        self.wise_overlay_mag = overlay_info["wise"]["default_overlay_mag"]
-        self.sdss_overlay_mag = overlay_info["sdss"]["default_overlay_mag"]
-        self.twomass_overlay_mag = overlay_info["twomass"]["default_overlay_mag"]
-        self.skymapper_overlay_mag = overlay_info["skymapper"]["default_overlay_mag"]
-        self.panstarrs_overlay_mag = overlay_info["panstarrs"]["default_overlay_mag"]
-        self.datapage_datatable_radius = "3"
-        self.datapage_grid_size = "250"
-
-    def read_config(self):
-        Config = configparser.ConfigParser()
-        Config.read(self.config_file)
-
-        sections = []
-        sections.append(Config["global_settings"])
-        sections.append(Config["query_settings"])
-        sections.append(Config["image_overlay_settings"])
-        sections.append(Config["search_settings"])
-        sections.append(Config["datapage_settings"])
-
-        for section in sections:
-            for key, val in section.items():
-                setattr(self, key, val)
-
-    def write_config(self):
-        config = configparser.ConfigParser()
-
-        config.add_section("global_settings")
-        config.set("global_settings", "enable_notifications", self.enable_notifications)
-        config.set("global_settings", "unit_size", self.unit_size)
-
-        config.add_section("query_settings")
-        config.set("query_settings", "query_data_radius", self.query_data_radius)
-        config.set("query_settings", "query_phot_radius", self.query_phot_radius)
-        config.set(
-            "query_settings", "query_bulkphot_radius", self.query_bulkphot_radius
-        )
-        config.set(
-            "query_settings", "query_lightcurve_radius", self.query_lightcurve_radius
-        )
-        config.set(
-            "query_settings", "query_spectrum_radius", self.query_spectrum_radius
-        )
-        config.set("query_settings", "query_sed_radius", self.query_sed_radius)
-        config.set(
-            "query_settings", "query_reddening_radius", self.query_reddening_radius
-        )
-        config.set("query_settings", "query_image_size", self.query_image_size)
-        config.set("query_settings", "query_image_overlays", self.query_image_overlays)
-        config.set("query_settings", "query_image_band", self.query_image_band)
-        config.set(
-            "query_settings",
-            "query_lightcurve_atlas_username",
-            self.query_lightcurve_atlas_username,
-        )
-        config.set(
-            "query_settings",
-            "query_lightcurve_atlas_password",
-            self.query_lightcurve_atlas_password,
-        )
-
-        config.add_section("image_overlay_settings")
-        config.set("image_overlay_settings", "gaia_overlay_mag", self.gaia_overlay_mag)
-        config.set(
-            "image_overlay_settings", "galex_overlay_mag", self.galex_overlay_mag
-        )
-        config.set("image_overlay_settings", "wise_overlay_mag", self.wise_overlay_mag)
-        config.set("image_overlay_settings", "sdss_overlay_mag", self.sdss_overlay_mag)
-        config.set(
-            "image_overlay_settings", "twomass_overlay_mag", self.twomass_overlay_mag
-        )
-        config.set(
-            "image_overlay_settings",
-            "skymapper_overlay_mag",
-            self.skymapper_overlay_mag,
-        )
-        config.set(
-            "image_overlay_settings",
-            "panstarrs_overlay_mag",
-            self.panstarrs_overlay_mag,
-        )
-
-        config.add_section("search_settings")
-        config.set("search_settings", "search_radius", self.search_radius)
-
-        config.add_section("datapage_settings")
-        config.set(
-            "datapage_settings",
-            "datapage_search_button_radius",
-            self.datapage_search_button_radius,
-        )
-        config.set(
-            "datapage_settings",
-            "datapage_datatable_radius",
-            self.datapage_datatable_radius,
-        )
-        config.set("datapage_settings", "datapage_grid_size", self.datapage_grid_size)
-
-        with open(self.config_file, "w") as file:
-            config.write(file)
-
-    def edit_config(self, key, value):
-        self.read_config()
-        if not isinstance(value, str):
-            try:
-                value = str(value)
-            except:
-                raise Exception("ATKConfig.ini options must be strings.")
-        setattr(self, key, value)
-        self.write_config()
-
-        self.output_config()
-
-    def output_config(self):
-        self.read_config()
-        for key, val in vars(self).items():
-            if key != "config_file":
-                print(f"{key} = {val}")