AstroToolkit 1.4.0__tar.gz → 1.4.1__tar.gz

AstroToolkit-1.4.0/README.md → astrotoolkit-1.4.1/PKG-INFO

@@ -1,3 +1,28 @@
+Metadata-Version: 2.1
+Name: AstroToolkit
+Version: 1.4.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.12
+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: selenium==4.17.2
+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.
@@ -571,7 +596,7 @@ data = list/dict data in structure returned by the query tool
 
 <br>
 
-**Supported plot types:** image, lightcurve, sed, spectra, powspec, hrd
+**Supported plot types:** image, lightcurve, sed, spectra, hrd
 
 <br>
 
@@ -591,10 +616,6 @@ Below is an outline of the usage and output of each plot type. Note that additon
 
 [HRD Plotting](#25-hrd-plotting)
 
-[Power Spectra Plotting](#26-power-spectra-plotting)
-
-<br>
-
 ### 2.1 Image Plotting<a id="21-image-plotting"></a>
 
 Type argument: 'image'
@@ -721,49 +742,6 @@ Description: Plots Gaia HRD data in the format returned by [hrd queries](#19-hrd
 
 <br><br>
 
-### 2.6 Power Spectra Plotting<a id="26-power-spectra-plotting"></a>
-
-Type argument: 'powspec'
-
-Description: Plots power spectra from lightcurve data in the format returned by [lightcurve queries](#16-lightcurve-query).
-
-<br>
-
-**Returns:** dict
-
-```
-{
-'type' : 'powspec'
-'survey' : str, survey of lightcurve data given to the powspec tool
-'source' : int/str, source used to get data (None if a pos was used)
-'pos': [ra,dec], pos used to get data (None if a source was used)
-'plot' : bokeh figure object, the actual plot
-'ATKfilename' : the default filename given by ATK
-}
-```
-
-<br><br>
-
-### 2.7 Timeseries Analysis<a id="27-timeseries-analysis"></a>
-
-Description: Not explicitly a plotting function, but included here for completeness. Runs period analysis on lightcurve data in format returned by [lightcurve queries](#16-lightcurve-query).
-
-<br>
-
-**Usage:**
-
-```
-tsanalysis(data)
-```
-
-where:
-
-```
-data = dict or list in format returned by lightcurve queries
-```
-
-<br><br>
-
 ## 3. Datapage Tools<a id="3-datapage-tools"></a>
 
 These functions are used to create custom datapages from any plots/data supported by AstroToolkit.
@@ -1409,21 +1387,7 @@ showplot(plot)
 
 <br><br>
 
-### Example 6: Fetching ZTF ligthcurve data, and then plotting it as a power spectrum
-
-```
-from AstroToolkit.Tools import lightcurvequery,plotpowspec,showplot
-
-data=lightcurvequery(survey='ztf',source=6050296829033196032)
-plot=plotpowspec(data)
-showplot(plot)
-```
-
-![](https://github.com/WD-planets/AstroToolkit/raw/latest/README_Images/powspec_example.png?raw=true)
-
-<br><br>
-
-### Example 7: Fetching Gaia parallax and WISE data
+### Example 6: Fetching Gaia parallax and WISE data
 
 ```
 from AstroToolkit.Tools import query
@@ -1434,7 +1398,7 @@ parallax = query(type='data',survey='gaia',source=source)['data']['parallax']
 wise_data = query(type='data',survey='wise',source=source)['data']
 ```
 
-### Example 8: Fetching 2MASS photometry for an object
+### Example 7: Fetching 2MASS photometry for an object
 
 ```
 from AstroToolkit.Tools import query
@@ -1442,7 +1406,7 @@ from AstroToolkit.Tools import query
 data=query(type='phot',survey='twomass',source=6050296829033196032)['data']
 ```
 
-### Example 9: Fetching photometry from all available surveys using a bulk photometry query
+### Example 8: Fetching photometry from all available surveys using a bulk photometry query
 
 ```
 from AstroToolkit.Tools import query
@@ -1455,20 +1419,8 @@ galex_data=bulk_phot['galex']
 
 <br><br>
 
-### Example 10: Fetching ZTF lightcurve data, and performing timeseries analysis
 
-```
-from AstroToolkit.Tools import query,tsanalysis
-
-data=query(type='lightcurve',survey='ztf',source=6050296829033196032)
-plot=tsanalysis(data)
-```
-
-![](https://github.com/WD-planets/AstroToolkit/raw/latest/README_Images/tsanalysis_example.png?raw=true)
-
-<br><br>
-
-### Example 11: Proper motion correction
+### Example 9: Proper motion correction
 
 ```
 from AstroToolkit.Tools import query,correctpm
@@ -1477,4 +1429,4 @@ gaia_data=query(type='data',survey='gaia',source=6050296829033196032)['data']
 ra,dec,pmra,pmdec=gaia_data['ra'][0],gaia_data['dec'][0],gaia_data['pmra'][0],gaia_data['pmdec'][0]
 
 ra_corrected,dec_corrected=correctpm([2016,0],[2000,0],ra,dec,pmra,pmdec)
-```
+```

AstroToolkit-1.4.0/PKG-INFO → astrotoolkit-1.4.1/README.md

@@ -1,32 +1,3 @@
-Metadata-Version: 2.1
-Name: AstroToolkit
-Version: 1.4.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.7
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: astropy==5.2.2
-Requires-Dist: astroquery==0.4.7
-Requires-Dist: bokeh==3.1.1
-Requires-Dist: cmasher==1.6.3
-Requires-Dist: importlib_resources==6.4.0
-Requires-Dist: matplotlib==3.7.5
-Requires-Dist: numba==0.58.1
-Requires-Dist: numpy==1.24.4
-Requires-Dist: pandas==2.0.3
-Requires-Dist: Pillow==10.2.0
-Requires-Dist: PyQt5==5.15.10
-Requires-Dist: PyQt5_sip==12.13.0
-Requires-Dist: Requests==2.31.0
-Requires-Dist: scikit_learn==1.3.2
-Requires-Dist: scipy==1.10.1
-Requires-Dist: selenium==4.17.2
-
 # AstroToolkit
 
 AstroToolkit (ATK) is a set of tools for fetching, plotting, and analysing astronomical data.
@@ -600,7 +571,7 @@ data = list/dict data in structure returned by the query tool
 
 <br>
 
-**Supported plot types:** image, lightcurve, sed, spectra, powspec, hrd
+**Supported plot types:** image, lightcurve, sed, spectra, hrd
 
 <br>
 
@@ -620,10 +591,6 @@ Below is an outline of the usage and output of each plot type. Note that additon
 
 [HRD Plotting](#25-hrd-plotting)
 
-[Power Spectra Plotting](#26-power-spectra-plotting)
-
-<br>
-
 ### 2.1 Image Plotting<a id="21-image-plotting"></a>
 
 Type argument: 'image'
@@ -750,49 +717,6 @@ Description: Plots Gaia HRD data in the format returned by [hrd queries](#19-hrd
 
 <br><br>
 
-### 2.6 Power Spectra Plotting<a id="26-power-spectra-plotting"></a>
-
-Type argument: 'powspec'
-
-Description: Plots power spectra from lightcurve data in the format returned by [lightcurve queries](#16-lightcurve-query).
-
-<br>
-
-**Returns:** dict
-
-```
-{
-'type' : 'powspec'
-'survey' : str, survey of lightcurve data given to the powspec tool
-'source' : int/str, source used to get data (None if a pos was used)
-'pos': [ra,dec], pos used to get data (None if a source was used)
-'plot' : bokeh figure object, the actual plot
-'ATKfilename' : the default filename given by ATK
-}
-```
-
-<br><br>
-
-### 2.7 Timeseries Analysis<a id="27-timeseries-analysis"></a>
-
-Description: Not explicitly a plotting function, but included here for completeness. Runs period analysis on lightcurve data in format returned by [lightcurve queries](#16-lightcurve-query).
-
-<br>
-
-**Usage:**
-
-```
-tsanalysis(data)
-```
-
-where:
-
-```
-data = dict or list in format returned by lightcurve queries
-```
-
-<br><br>
-
 ## 3. Datapage Tools<a id="3-datapage-tools"></a>
 
 These functions are used to create custom datapages from any plots/data supported by AstroToolkit.
@@ -1438,21 +1362,7 @@ showplot(plot)
 
 <br><br>
 
-### Example 6: Fetching ZTF ligthcurve data, and then plotting it as a power spectrum
-
-```
-from AstroToolkit.Tools import lightcurvequery,plotpowspec,showplot
-
-data=lightcurvequery(survey='ztf',source=6050296829033196032)
-plot=plotpowspec(data)
-showplot(plot)
-```
-
-![](https://github.com/WD-planets/AstroToolkit/raw/latest/README_Images/powspec_example.png?raw=true)
-
-<br><br>
-
-### Example 7: Fetching Gaia parallax and WISE data
+### Example 6: Fetching Gaia parallax and WISE data
 
 ```
 from AstroToolkit.Tools import query
@@ -1463,7 +1373,7 @@ parallax = query(type='data',survey='gaia',source=source)['data']['parallax']
 wise_data = query(type='data',survey='wise',source=source)['data']
 ```
 
-### Example 8: Fetching 2MASS photometry for an object
+### Example 7: Fetching 2MASS photometry for an object
 
 ```
 from AstroToolkit.Tools import query
@@ -1471,7 +1381,7 @@ from AstroToolkit.Tools import query
 data=query(type='phot',survey='twomass',source=6050296829033196032)['data']
 ```
 
-### Example 9: Fetching photometry from all available surveys using a bulk photometry query
+### Example 8: Fetching photometry from all available surveys using a bulk photometry query
 
 ```
 from AstroToolkit.Tools import query
@@ -1484,20 +1394,8 @@ galex_data=bulk_phot['galex']
 
 <br><br>
 
-### Example 10: Fetching ZTF lightcurve data, and performing timeseries analysis
 
-```
-from AstroToolkit.Tools import query,tsanalysis
-
-data=query(type='lightcurve',survey='ztf',source=6050296829033196032)
-plot=tsanalysis(data)
-```
-
-![](https://github.com/WD-planets/AstroToolkit/raw/latest/README_Images/tsanalysis_example.png?raw=true)
-
-<br><br>
-
-### Example 11: Proper motion correction
+### Example 9: Proper motion correction
 
 ```
 from AstroToolkit.Tools import query,correctpm
@@ -1506,4 +1404,4 @@ gaia_data=query(type='data',survey='gaia',source=6050296829033196032)['data']
 ra,dec,pmra,pmdec=gaia_data['ra'][0],gaia_data['dec'][0],gaia_data['pmra'][0],gaia_data['pmdec'][0]
 
 ra_corrected,dec_corrected=correctpm([2016,0],[2000,0],ra,dec,pmra,pmdec)
-```
+```

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/pyproject.toml

@@ -7,34 +7,30 @@ include-package-data = true
 
 [project]
 name = "AstroToolkit"
-version = "1.4.0"
+version = "1.4.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.7"
+requires-python = ">=3.12"
 classifiers = [
     "Programming Language :: Python :: 3",
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "astropy==5.2.2",
+    "astropy==6.0.1",
     "astroquery==0.4.7",
-    "bokeh==3.1.1",
-    "cmasher==1.6.3",
+    "bokeh==3.4.1",
+    "cmasher==1.8.0",
+    "matplotlib==3.8.4",
     "importlib_resources==6.4.0",
-    "matplotlib==3.7.5",
-    "numba==0.58.1",
-    "numpy==1.24.4",
-    "pandas==2.0.3",
-    "Pillow==10.2.0",
-    "PyQt5==5.15.10",
-    "PyQt5_sip==12.13.0",
+    "numpy==1.26.4",
+    "pandas==2.2.2",
     "Requests==2.31.0",
-    "scikit_learn==1.3.2",
-    "scipy==1.10.1",
-    "selenium==4.17.2"
+    "selenium==4.17.2",
+    "beautifulsoup4==4.12.3",
+    "scipy==1.13.0",
 ]
 
 [project.urls]

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/src/AstroToolkit/Data/data.py

@@ -6,7 +6,6 @@ from io import BytesIO
 import pandas as pd
 import warnings
 import xml.etree.ElementTree as ET
-import itertools
 
 from ..Misc.ProperMotionCorrection import PMCorrection
 

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/src/AstroToolkit/Data/imaging.py

@@ -1,11 +1,7 @@
-from tkinter import W
 from astropy.table import Table
 from astropy.io import fits
-import astropy
 from astropy.visualization import PercentileInterval, AsinhStretch
 from astropy.wcs import WCS
-import PIL
-from PIL import Image
 from io import BytesIO
 import numpy as np
 import requests
@@ -34,7 +30,7 @@ def get_image_dict(survey,source=None,pos=None,location=None,size=30,band='g'):
 		url_size=size*4
 		service='https://ps1images.stsci.edu/cgi-bin/ps1filenames.py'
 		url=f'{service}?ra={ra}&dec={dec}&band={band}'
-	
+
 		# get table of returned image filenames
 		try:
 			table=Table.read(url, format='ascii')
@@ -89,9 +85,14 @@ def get_image_dict(survey,source=None,pos=None,location=None,size=30,band='g'):
 		urlMain=f'{service}?ra={ra}&d={dec}&v=3&e=J2000&f=fits&h={url_size}&w={url_size}'
 
 	# send request using the URL returned for the selected survey
-	r=requests.get(urlMain,timeout=15)
+	try:
+		r=requests.get(urlMain,timeout=15)
+	except:
+		print(f'Note: Experiencing issues with {survey}.')
+		return failed_search()
 	if r.status_code!=200:
 		print(f'Note: Experiencing issues with {survey}.')
+		return failed_search()
 
 	try:
 		fh=fits.open(BytesIO(r.content))

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/src/AstroToolkit/Data/overlays.py

@@ -1,4 +1,3 @@
-import pandas as pd
 import math
 
 from ..Misc.ProperMotionCorrection import PMCorrection

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/src/AstroToolkit/Data/sed.py

@@ -1,4 +1,3 @@
-from re import S
 import astropy.units as u
 import numpy as np
 import pandas as pd

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/src/AstroToolkit/Datapages/grid.py

@@ -1,6 +1,5 @@
 from bokeh.plotting import figure
 from bokeh.models import Label, Range1d
-import bokeh
 
 def get_grid(dimensions,plots,grid_size=250):
 	# Calculates the area occupied by the input plots (i.e. just normalized by /grid_size)

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/src/AstroToolkit/Datapages/metadata.py

@@ -1,5 +1,4 @@
 from bokeh.models import ColumnDataSource,DataTable,TableColumn
-import pandas as pd
 
 from ..Tools import query
 from ..Data.data import get_survey_list

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/src/AstroToolkit/Examples/datapage_creation.py

@@ -1,9 +1,9 @@
-from AstroToolkit.Tools import query,plot,getbuttons,gridsetup,getmdtable,showplot
+from AstroToolkit.Tools import query,plot,getbuttons,gridsetup,getmdtable,showplot,export
 from bokeh.layouts import column,row,layout
 from bokeh.plotting import output_file
+import chromedriver_binary
 
 # source = Hu Leo
-#source=2552928187080872832
 source=587316166180416640
 
 # set grid size (scales overally size of datapage)
@@ -31,9 +31,6 @@ lightcurve_data=query(type='lightcurve',survey='ztf',source=source)
 # plot each lightcurve in lightcurve_data and set colour of each plot
 lightcurves=plot(lightcurve_data,colours=['green','red','blue'])
 
-# plot power spectrum data (lightcurve_data)
-power_spectrum=plot(lightcurve_data,type='powspec',)
-
 # get SIMBAD and Vizier buttons
 buttons=getbuttons(grid_size=grid_size,source=source)
 
@@ -54,18 +51,18 @@ grid_plots=gridsetup(dimensions={'width':6,'height':5},plots=[{'name':'image','f
                                                               {'name':'sed','figure':sed,'width':2,'height':1},
                                                               {'name':'lightcurves','figure':lightcurves,'width':2,'height':1},
                                                               {'name':'buttons','figure':buttons,'width':1,'height':1},
-                                                              {'name':'spectrum','figure':spectrum,'width':3,'height':1},
-                                                              {'name':'powspec','figure':power_spectrum,'width':2,'height':1},
+                                                              {'name':'spectrum','figure':spectrum,'width':5,'height':1},
                                                               {'name':'metadata_table','figure':metadata,'width':6,'height':2}],
                                                               grid_size=grid_size)
 
 # set up the final grid
 datapage=layout(column(
                 row(grid_plots['image'],grid_plots['hrd'],column(grid_plots['sed'],grid_plots['lightcurves'])),
-                row(grid_plots['buttons'],grid_plots['spectrum'],grid_plots['powspec']),
+                row(grid_plots['buttons'],grid_plots['spectrum']),
                 row(grid_plots['metadata_table'])
 	            ))
 
 output_file(f'{source}_datapage.html')
 
-showplot(datapage)
+showplot(datapage)
+export(datapage)

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/src/AstroToolkit/Misc/ProperMotionCorrection.py

@@ -1,4 +1,3 @@
-from calendar import c
 import math
 
 '''

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/src/AstroToolkit/Plotting/HRD.py

@@ -1,11 +1,9 @@
 from astropy.table import Table
-import matplotlib.pyplot as plt
 import numpy as np
 from scipy import stats
 import math
 import cmasher as cmr
 from bokeh.plotting import figure
-import os
 from importlib_resources import files
 from bokeh.models import CustomJS
 from bokeh import events

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/src/AstroToolkit/Plotting/imaging.py

@@ -1,7 +1,6 @@
 from bokeh.models import Range1d, CustomJS
-import astropy
 import numpy as np
-from bokeh.plotting import figure, output_file
+from bokeh.plotting import figure
 from bokeh import events
 
 def plot_image(image_dict):

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/src/AstroToolkit/Plotting/lightcurves.py

@@ -1,7 +1,7 @@
 import matplotlib
 import numpy as np
 from bokeh.plotting import figure
-from bokeh.models import Whisker, ColumnDataSource
+from bokeh.models import ColumnDataSource
 from bokeh.transform import linear_cmap
 from bokeh.models import CustomJS
 from bokeh import events
@@ -108,7 +108,7 @@ def plot_lightcurve(data,colour,colours):
 		mapper=linear_cmap(field_name='mag',palette=palette,low=min(mag),high=max(mag))
 
 		# plot points
-		plot.circle(x='time',y='mag',source=source,color=mapper,legend_label=f"{data_dict['survey']} {data_dict['band']}")
+		plot.scatter(x='time',y='mag',source=source,color=mapper,marker='circle',legend_label=f"{data_dict['survey']} {data_dict['band']}")
 
 		# plot error bars
 		err_xs=[]

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/src/AstroToolkit/Plotting/sed.py

@@ -1,5 +1,5 @@
 from bokeh.plotting import figure
-from bokeh.models import Whisker, ColumnDataSource, CustomJS, PrintfTickFormatter
+from bokeh.models import CustomJS, PrintfTickFormatter
 from bokeh import events
 import math
 
@@ -47,9 +47,9 @@ def plot_sed(sed_data):
         # plot data
         for i,v in enumerate(x_arr):
             if not math.isnan(err_arr[i]):
-                plot.circle(x=x_arr[i],y=y_arr[i],color=colour_arr[current_survey_index],legend_label=f'{survey}')
+                plot.scatter(x=x_arr[i],y=y_arr[i],color=colour_arr[current_survey_index],marker='circle',legend_label=f'{survey}')
             else:
-                plot.cross(x=x_arr[i],y=y_arr[i],color=colour_arr[current_survey_index],legend_label=f'{survey} (Upper Limit)',size=7.5)
+                plot.scatter(x=x_arr[i],y=y_arr[i],color=colour_arr[current_survey_index],marker='cross',legend_label=f'{survey} (Upper Limit)',size=7.5)
            
         # plot errors
         plot.multi_line(err_xs,err_ys,color=colour_arr[current_survey_index],legend_label=f'{survey}',level='underlay',line_width=0.5,line_cap='square')

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/src/AstroToolkit/Plotting/spectra.py

@@ -1,10 +1,8 @@
-import pandas as pd
 from bokeh.plotting import figure
 from bokeh.models import Span, CheckboxGroup, CustomJS, Label, Range1d
-from bokeh.layouts import row,column
+from bokeh.layouts import row
 from bokeh.models import PrintfTickFormatter
 from bokeh import events
-import math
 
 def get_plot(spectrum_dict):
 	if spectrum_dict['data']==None:

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/src/AstroToolkit/Tools.py

@@ -12,6 +12,8 @@ Changelog:
 '''
 To-Do:
 HIGH PRIORITY
+- look into plotly
+- astropy readfits warnings
 - Better scaling for detection overlay sizes
 - check config for if all keys are present, if not then make a new config file with existing key:value pairs saved
 - talk to boris about combining lightcurves
@@ -47,6 +49,41 @@ newline='\n'
 
 config_file=files('AstroToolkit.Settings').joinpath('config.ini')	
 
+# Read config file
+def readconfig():
+	Config=configparser.ConfigParser()
+	Config.read(config_file)
+
+	settings=Config['settings']
+	for key in settings:
+		if settings[key]=='True':
+			settings[key]='1'
+		elif settings[key]=='False':
+			settings[key]='0'
+
+	config={}		
+
+	# set up dictionary with key:value pairs of the config file
+	config['ENABLE_NOTIFICATIONS']=int(settings['enable_notifications'])
+	config['DATAQUERY_RADIUS']=float(settings['dataquery_radius'])
+	config['PHOTQUERY_RADIUS']=float(settings['photquery_radius'])
+	config['BULKPHOTQUERY_RADIUS']=float(settings['bulkphotquery_radius'])
+	config['IMAGEQUERY_SIZE']=float(settings['imagequery_size'])
+	config['IMAGEQUERY_OVERLAYS']=str(settings['imagequery_overlays'])
+	config['LIGHTCURVEQUERY_RADIUS']=float(settings['lightcurvequery_radius'])
+	config['ATLAS_USERNAME']=str(settings['atlas_username'])
+	config['ATLAS_PASSWORD']=str(settings['atlas_password'])
+	config['SED_RADIUS']=float(settings['sed_radius'])
+	config['SPECTRUM_RADIUS']=float(settings['spectrum_radius'])
+	config['GRID_SIZE']=int(settings['grid_size'])
+	config['SIMBAD_RADIUS']=int(settings['button_simbad_radius'])
+	config['VIZIER_RADIUS']=int(settings['button_vizier_radius'])
+	config['PLOT_SIZE']=int(settings['plot_size'])
+	config['READFITS_SOURCENAME']=str(settings['readfits_sourcename'])
+	config['READFITS_COORDNAMES']=str(settings['readfits_coordnames']).split(',')
+	
+	return config
+
 # Create default config file if the file doesn't already exist (i.e. when the package is first installed)
 # This handles all default parameters unless they are passed to a tool by the user, in which case these are overwritten
 if not os.path.isfile(config_file):
@@ -73,6 +110,8 @@ if not os.path.isfile(config_file):
 
 	with open(config_file,'w') as configfile:
 		config.write(configfile)
+else:
+	existing_values=readconfig()
 
 # allows user to edit the config file
 def editconfig(options):
@@ -90,41 +129,6 @@ def editconfig(options):
 		
 	with open(config_file,'w') as configfile:
 		edit.write(configfile)
-	
-# Read config file
-def readconfig():
-	Config=configparser.ConfigParser()
-	Config.read(config_file)
-
-	settings=Config['settings']
-	for key in settings:
-		if settings[key]=='True':
-			settings[key]='1'
-		elif settings[key]=='False':
-			settings[key]='0'
-
-	config={}		
-
-	# set up dictionary with key:value pairs of the config file
-	config['ENABLE_NOTIFICATIONS']=int(settings['enable_notifications'])
-	config['DATAQUERY_RADIUS']=float(settings['dataquery_radius'])
-	config['PHOTQUERY_RADIUS']=float(settings['photquery_radius'])
-	config['BULKPHOTQUERY_RADIUS']=float(settings['bulkphotquery_radius'])
-	config['IMAGEQUERY_SIZE']=float(settings['imagequery_size'])
-	config['IMAGEQUERY_OVERLAYS']=str(settings['imagequery_overlays'])
-	config['LIGHTCURVEQUERY_RADIUS']=float(settings['lightcurvequery_radius'])
-	config['ATLAS_USERNAME']=str(settings['atlas_username'])
-	config['ATLAS_PASSWORD']=str(settings['atlas_password'])
-	config['SED_RADIUS']=float(settings['sed_radius'])
-	config['SPECTRUM_RADIUS']=float(settings['spectrum_radius'])
-	config['GRID_SIZE']=int(settings['grid_size'])
-	config['SIMBAD_RADIUS']=int(settings['button_simbad_radius'])
-	config['VIZIER_RADIUS']=int(settings['button_vizier_radius'])
-	config['PLOT_SIZE']=int(settings['plot_size'])
-	config['READFITS_SOURCENAME']=str(settings['readfits_sourcename'])
-	config['READFITS_COORDNAMES']=str(settings['readfits_coordnames']).split(',')
-	
-	return config
 
 # prints the current value of a given config parameter to the terminal, and returns it
 def getconfigvalue(parameter):
@@ -451,7 +455,7 @@ def query(type,survey=None,source=None,pos=None,radius=None,size=None,overlays='
 def plot(data,type=None,colour='black',colours=None):
 	config=readconfig()
 
-	accepted_types=['image','lightcurve','sed','spectra','powspec','hrd']
+	accepted_types=['image','lightcurve','sed','spectra','hrd']
 
 	if colour!='black':
 		print('Note: argument "colour" only has an effect in lightcurve plotting.')
@@ -605,40 +609,6 @@ def plot(data,type=None,colour='black',colours=None):
 
 		return plot_dict
 	
-
-	elif type=='powspec':
-		import copy
-		
-		from .Plotting.powspec import get_plot
-	
-		# stops data from being flattened by the powspec plotting
-		data_copy=copy.deepcopy(data)
-
-		plot=get_plot(dataset=data_copy)
-
-		if plot!=None:
-			# name file
-			filename=name_file(data=data,data_type='ATKpowspec')
-			output_file(filename)
-		
-			# set size of file according to defaults in config
-			plot.width,plot.height=config['PLOT_SIZE']*2,config['PLOT_SIZE']
-		else:
-			filename=None
-
-		plot_dict={'type':'powspec'}
-		for i,val in enumerate(data):
-			if val!=None:
-				plot_dict['survey']=val['survey']
-				plot_dict['source']=val['source']
-				plot_dict['pos']=val['pos']
-
-		plot_dict['plot']=plot
-		plot_dict['ATKfilename']=filename
-
-		return plot_dict
-	
-
 	elif type=='hrd':
 		from .Plotting.HRD import get_plot
 
@@ -658,20 +628,6 @@ def plot(data,type=None,colour='black',colours=None):
 		
 		return plot_dict
 
-# Timeseries --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-def tsanalysis(data):
-	config=readconfig()
-
-	# enables notifications of currently running tool if enabled in config
-	if config['ENABLE_NOTIFICATIONS']==1:
-		print(f'Running time series analysis...{newline}')	
-
-	from .Timeseries.ztfanalysis import get_analysis
-	
-	# load timeseries analysis tool
-	get_analysis(dataset=data)
-
 # Data Pages --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 def gridsetup(dimensions,plots,grid_size=None):

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/src/AstroToolkit.egg-info/PKG-INFO

@@ -1,31 +1,27 @@
 Metadata-Version: 2.1
 Name: AstroToolkit
-Version: 1.4.0
+Version: 1.4.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.7
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: astropy==5.2.2
+Requires-Dist: astropy==6.0.1
 Requires-Dist: astroquery==0.4.7
-Requires-Dist: bokeh==3.1.1
-Requires-Dist: cmasher==1.6.3
+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: matplotlib==3.7.5
-Requires-Dist: numba==0.58.1
-Requires-Dist: numpy==1.24.4
-Requires-Dist: pandas==2.0.3
-Requires-Dist: Pillow==10.2.0
-Requires-Dist: PyQt5==5.15.10
-Requires-Dist: PyQt5_sip==12.13.0
+Requires-Dist: numpy==1.26.4
+Requires-Dist: pandas==2.2.2
 Requires-Dist: Requests==2.31.0
-Requires-Dist: scikit_learn==1.3.2
-Requires-Dist: scipy==1.10.1
 Requires-Dist: selenium==4.17.2
+Requires-Dist: beautifulsoup4==4.12.3
+Requires-Dist: scipy==1.13.0
 
 # AstroToolkit
 
@@ -600,7 +596,7 @@ data = list/dict data in structure returned by the query tool
 
 <br>
 
-**Supported plot types:** image, lightcurve, sed, spectra, powspec, hrd
+**Supported plot types:** image, lightcurve, sed, spectra, hrd
 
 <br>
 
@@ -620,10 +616,6 @@ Below is an outline of the usage and output of each plot type. Note that additon
 
 [HRD Plotting](#25-hrd-plotting)
 
-[Power Spectra Plotting](#26-power-spectra-plotting)
-
-<br>
-
 ### 2.1 Image Plotting<a id="21-image-plotting"></a>
 
 Type argument: 'image'
@@ -750,49 +742,6 @@ Description: Plots Gaia HRD data in the format returned by [hrd queries](#19-hrd
 
 <br><br>
 
-### 2.6 Power Spectra Plotting<a id="26-power-spectra-plotting"></a>
-
-Type argument: 'powspec'
-
-Description: Plots power spectra from lightcurve data in the format returned by [lightcurve queries](#16-lightcurve-query).
-
-<br>
-
-**Returns:** dict
-
-```
-{
-'type' : 'powspec'
-'survey' : str, survey of lightcurve data given to the powspec tool
-'source' : int/str, source used to get data (None if a pos was used)
-'pos': [ra,dec], pos used to get data (None if a source was used)
-'plot' : bokeh figure object, the actual plot
-'ATKfilename' : the default filename given by ATK
-}
-```
-
-<br><br>
-
-### 2.7 Timeseries Analysis<a id="27-timeseries-analysis"></a>
-
-Description: Not explicitly a plotting function, but included here for completeness. Runs period analysis on lightcurve data in format returned by [lightcurve queries](#16-lightcurve-query).
-
-<br>
-
-**Usage:**
-
-```
-tsanalysis(data)
-```
-
-where:
-
-```
-data = dict or list in format returned by lightcurve queries
-```
-
-<br><br>
-
 ## 3. Datapage Tools<a id="3-datapage-tools"></a>
 
 These functions are used to create custom datapages from any plots/data supported by AstroToolkit.
@@ -1438,21 +1387,7 @@ showplot(plot)
 
 <br><br>
 
-### Example 6: Fetching ZTF ligthcurve data, and then plotting it as a power spectrum
-
-```
-from AstroToolkit.Tools import lightcurvequery,plotpowspec,showplot
-
-data=lightcurvequery(survey='ztf',source=6050296829033196032)
-plot=plotpowspec(data)
-showplot(plot)
-```
-
-![](https://github.com/WD-planets/AstroToolkit/raw/latest/README_Images/powspec_example.png?raw=true)
-
-<br><br>
-
-### Example 7: Fetching Gaia parallax and WISE data
+### Example 6: Fetching Gaia parallax and WISE data
 
 ```
 from AstroToolkit.Tools import query
@@ -1463,7 +1398,7 @@ parallax = query(type='data',survey='gaia',source=source)['data']['parallax']
 wise_data = query(type='data',survey='wise',source=source)['data']
 ```
 
-### Example 8: Fetching 2MASS photometry for an object
+### Example 7: Fetching 2MASS photometry for an object
 
 ```
 from AstroToolkit.Tools import query
@@ -1471,7 +1406,7 @@ from AstroToolkit.Tools import query
 data=query(type='phot',survey='twomass',source=6050296829033196032)['data']
 ```
 
-### Example 9: Fetching photometry from all available surveys using a bulk photometry query
+### Example 8: Fetching photometry from all available surveys using a bulk photometry query
 
 ```
 from AstroToolkit.Tools import query
@@ -1484,20 +1419,8 @@ galex_data=bulk_phot['galex']
 
 <br><br>
 
-### Example 10: Fetching ZTF lightcurve data, and performing timeseries analysis
-
-```
-from AstroToolkit.Tools import query,tsanalysis
-
-data=query(type='lightcurve',survey='ztf',source=6050296829033196032)
-plot=tsanalysis(data)
-```
-
-![](https://github.com/WD-planets/AstroToolkit/raw/latest/README_Images/tsanalysis_example.png?raw=true)
-
-<br><br>
 
-### Example 11: Proper motion correction
+### Example 9: Proper motion correction
 
 ```
 from AstroToolkit.Tools import query,correctpm

{AstroToolkit-1.4.0 → astrotoolkit-1.4.1}/src/AstroToolkit.egg-info/SOURCES.txt

@@ -39,7 +39,7 @@ src/AstroToolkit/Settings/__init__.py
 src/AstroToolkit/Timeseries/README - Windows.txt
 src/AstroToolkit/Timeseries/README.txt
 src/AstroToolkit/Timeseries/__init__.py
-src/AstroToolkit/Timeseries/aov.cp38-win_amd64.pyd
+src/AstroToolkit/Timeseries/aov.cp311-win_amd64.pyd
 src/AstroToolkit/Timeseries/aov.f90
 src/AstroToolkit/Timeseries/aovconst.f90
 src/AstroToolkit/Timeseries/aovsub.f90

astrotoolkit-1.4.1/src/AstroToolkit.egg-info/requires.txt

@@ -0,0 +1,12 @@
+astropy==6.0.1
+astroquery==0.4.7
+bokeh==3.4.1
+cmasher==1.8.0
+matplotlib==3.8.4
+importlib_resources==6.4.0
+numpy==1.26.4
+pandas==2.2.2
+Requests==2.31.0
+selenium==4.17.2
+beautifulsoup4==4.12.3
+scipy==1.13.0

AstroToolkit-1.4.0/src/AstroToolkit.egg-info/requires.txt

@@ -1,16 +0,0 @@
-astropy==5.2.2
-astroquery==0.4.7
-bokeh==3.1.1
-cmasher==1.6.3
-importlib_resources==6.4.0
-matplotlib==3.7.5
-numba==0.58.1
-numpy==1.24.4
-pandas==2.0.3
-Pillow==10.2.0
-PyQt5==5.15.10
-PyQt5_sip==12.13.0
-Requests==2.31.0
-scikit_learn==1.3.2
-scipy==1.10.1
-selenium==4.17.2