AstroToolkit 1.5.0__tar.gz → 1.5.2__tar.gz

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

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: AstroToolkit
-Version: 1.5.0
+Version: 1.5.2
 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.2/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.2}/pyproject.toml

@@ -7,13 +7,13 @@ include-package-data = true
 
 [project]
 name = "AstroToolkit"
-version = "1.5.0"
+version = "1.5.2"
 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.2/src/AstroToolkit/Data/bin_lightcurves.py

@@ -0,0 +1,106 @@
+def binning(data, bins=None, bin_size=None):
+    import numpy as np
+
+    ra = data["ra"]
+    dec = data["dec"]
+
+    mag = data["mag"]
+    mag_err = data["mag_err"]
+    if "mjd_ori" in data:
+        time = data["mjd_ori"]
+        time_unit = "mjd_ori"
+    else:
+        time = data["hjd_ori"]
+        time_unit = "hjd_ori"
+
+    bin_edges_arr = []
+
+    if bins:
+        bin_edge_lower = 0
+        bin_size = int(len(time) / bins)
+        bin_edge_higher = bin_size
+
+        while True:
+            reached_end = False
+            if bin_edge_higher + bin_size >= len(time):
+                bin_edge_higher = len(time) - 1
+                reached_end = True
+
+            bin_edges_arr.append([bin_edge_lower, bin_edge_higher])
+            bin_edge_lower = bin_edge_higher
+            bin_edge_higher += bin_size
+
+            if reached_end:
+                break
+
+        for i, val in enumerate(bin_edges_arr):
+            bin_edges_arr[i][0] = time[val[0]]
+            bin_edges_arr[i][1] = time[val[1]]
+
+    elif bin_size:
+        bin_edge_lower = min(time)
+
+        try:
+            bin_unit = bin_size[-1]
+            bin_size = float(bin_size[:-1])
+        except:
+            raise Exception("No binsize unit given.")
+
+        if bin_unit == "d":
+            bin_size = bin_size
+        elif bin_unit == "h":
+            bin_size = bin_size / 24
+        elif bin_unit == "m":
+            bin_size = bin_size / (24 * 60)
+        else:
+            raise Exception("Invalid binsize unit.")
+
+        bin_edge_higher = bin_edge_lower + bin_size
+
+        while True:
+            reached_end = False
+            if bin_edge_higher + bin_size >= max(time):
+                bin_edge_higher = max(time)
+                reached_end = True
+
+            bin_edges_arr.append([bin_edge_lower, bin_edge_higher])
+            bin_edge_lower = bin_edge_higher
+            bin_edge_higher += bin_size
+
+            if reached_end:
+                break
+
+    final_mags, final_times, final_errors, final_ra, final_dec = [], [], [], [], []
+    for bin_edges in bin_edges_arr:
+        mask = [i for i, val in enumerate(time) if bin_edges[0] <= val < bin_edges[1]]
+
+        if len(mask) == 0:
+            continue
+
+        binned_mags = [val for i, val in enumerate(mag) if i in mask]
+        binned_ra = [val for i, val in enumerate(ra) if i in mask]
+        binned_dec = [val for i, val in enumerate(dec) if i in mask]
+
+        weights = [1 / pow(err, 2) for i, err in enumerate(mag_err) if i in mask]
+
+        weighted_mean, norm = np.average(binned_mags, weights=weights, returned=True)
+
+        mean_ra = sum(binned_ra) / len(binned_ra)
+        mean_dec = sum(binned_dec) / len(binned_dec)
+
+        final_mags.append(weighted_mean)
+        final_ra.append(mean_ra)
+        final_dec.append(mean_dec)
+        final_times.append((bin_edges[1] + bin_edges[0]) / 2)
+        final_errors.append(1 / np.sqrt(norm))
+
+    base_time_unit = time_unit[:-4]
+
+    data["mag"] = final_mags
+    data[time_unit] = final_times
+    data["mag_err"] = final_errors
+    data[base_time_unit] = [t - min(final_times) for t in final_times]
+    data["ra"] = final_ra
+    data["dec"] = final_dec
+
+    return data

{astrotoolkit-1.5.0 → astrotoolkit-1.5.2}/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],
@@ -46,6 +46,7 @@ class SurveyInfo:
             "gaia_lc": [2016, 0],
             "asassn": [2015, 0],
             "crts": [2000, 0],
+            "tess": [2020, 0],
         }
         self.catalogues = {
             "gaia": "I/355/gaiadr3",
@@ -255,7 +256,7 @@ class SurveyInfo:
             "ztf",
         ]
 
-        self.lightcurve_surveys = ["atlas", "ztf", "crts", "asassn", "gaia"]
+        self.lightcurve_surveys = ["atlas", "ztf", "crts", "asassn", "gaia", "tess"]
 
         self.reddening_surveys = ["stilism", "gdre"]
 
@@ -278,7 +279,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.2}/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:
@@ -19,11 +19,11 @@ if not os.path.isfile(str(TIMER)):
         timer.write(current_time)
 
 
-# Adapted from codee given by Keith, as CRTS interface is not well-suited to scripted queries
+# Adapted from code given by Keith, as CRTS interface is not well-suited to scripted queries
 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.2/src/AstroToolkit/Data/fetch_tess.py

@@ -0,0 +1,75 @@
+# Adapted from code given by Keith
+def get_TESS_lightcurve(pos, radius):
+    """
+    Note on converting to magnitudes:
+
+    https://heasarc.gsfc.nasa.gov/docs/tess/observing-technical.html
+    says that 15000 e/s gives a magnitude of 10
+
+    Tess returns data in astropy quantities - flux in e/s
+
+    u.Magnitude(lc['flux']) is the same as -2.5*log10(lc['flux'])
+
+    so plugging in 15000 and m=10 gives zp=20.44*u.ABmag
+    """
+
+    import warnings
+
+    import astropy.units as u
+    import lightkurve as lk
+    import numpy as np
+    from astropy.table import Table, vstack
+
+    ra, dec = pos
+
+    Search = lk.search_lightcurve(
+        str(ra) + " " + str(dec), mission="TESS", radius=radius
+    )
+
+    if len(Search) > 0:
+        lcurve = []
+        for s in Search:
+            try:
+                lqq = s.download_all()
+                lcurve += lqq
+            except:
+                print("Note: experiencing issues with TESS.")
+        sectors = []
+        LC = Table([])
+        for lc in lcurve:
+            if lc.meta["SECTOR"] not in sectors:
+                sectors += [lc.meta["SECTOR"]]
+                warnings.simplefilter("ignore")
+                lc = lc[lc["flux"] > 0]
+                lc["mag"] = u.Magnitude(lc["flux"]) + 20.44 * u.ABmag
+                lc["mjd"] = lc["time"].mjd.astype("float")
+                try:
+                    tab = lc.to_table()[
+                        [
+                            "time",
+                            "flux",
+                            "flux_err",
+                            "sap_flux",
+                            "quality",
+                            "mag",
+                            "mjd",
+                        ]
+                    ]
+                except:
+                    tab = lc.to_table()[
+                        ["time", "flux", "flux_err", "quality", "mag", "mjd"]
+                    ]
+                    tab["sap_flux"] = 0
+                has_nan = np.zeros(len(tab), dtype=bool)
+                for col in tab.itercols():
+                    if col.info.dtype.kind in ["f", "i"]:
+                        has_nan |= np.isnan(col)
+                tab_nonan = tab[~has_nan]
+                if len(LC) == 0:
+                    LC = tab_nonan
+                else:
+                    LC = vstack([LC, tab_nonan])
+        return LC.to_pandas()
+    else:
+        print("Note: TESS query returned no data.")
+        return None

{astrotoolkit-1.5.0 → astrotoolkit-1.5.2}/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)