AstroToolkit 1.3.3__tar.gz → 1.3.5__tar.gz

{AstroToolkit-1.3.3/src/AstroToolkit.egg-info → AstroToolkit-1.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: AstroToolkit
-Version: 1.3.3
+Version: 1.3.5
 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
@@ -25,6 +25,7 @@ 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-1.3.3 → AstroToolkit-1.3.5}/pyproject.toml

@@ -7,7 +7,7 @@ include-package-data = true
 
 [project]
 name = "AstroToolkit"
-version = "1.3.3"
+version = "1.3.5"
 authors = [
   { name="Ethan Moorfield", email="ethan.moorfield@hotmail.co.uk"},
 ]
@@ -34,6 +34,7 @@ dependencies = [
     "Requests==2.31.0",
     "scikit_learn==1.3.2",
     "scipy==1.10.1",
+    "selenium==4.17.2"
 ]
 
 [project.urls]

{AstroToolkit-1.3.3 → AstroToolkit-1.3.5}/src/AstroToolkit/Data/lightcurves.py

@@ -188,8 +188,7 @@ def get_data(survey,ra,dec,radius=3,source=None,pos=None,username=None,password=
 			headers={'Authorization':f'Token {token}','Accept':'application/json'}
 			
 		else:
-			print(f'ERROR {r.status_code}.')
-			print(r.json())
+			print(f'Note: Experiencing issues with ATLAS')
 			return f_return
 			
 		task_url=None
@@ -220,9 +219,8 @@ def get_data(survey,ra,dec,radius=3,source=None,pos=None,username=None,password=
 					print(f'Waiting {waittime} seconds.')
 					time.sleep(waittime)
 				else:
-					print(f'ERROR {r.status_code}')
-					print(r.json())
-					sys.exit()
+					print(f'Note: Experiencing issues with ATLAS')
+					return f_return
 					
 		result_url=None
 		while not result_url:
@@ -241,9 +239,8 @@ def get_data(survey,ra,dec,radius=3,source=None,pos=None,username=None,password=
 					time.sleep(10)
 				
 				else:
-					print(f'ERROR {r.status_code}')
-					print(r.json())
-					sys.exit()
+					print(f'Note: Experiencing issues with ATLAS')
+					return f_return
 					
 		with requests.Session() as s:
 			textdata=s.get(result_url,headers=headers).text

{AstroToolkit-1.3.3 → AstroToolkit-1.3.5}/src/AstroToolkit/Plotting/HRD.py

@@ -80,7 +80,10 @@ def get_plot(source=None,sources=None):
 		y=gmag+5*np.log10(parallax/1000)+5
 		
 		if not math.isnan(gmag) and not math.isnan(bpmag) and not math.isnan(rpmag) and not math.isnan(parallax):
-			plot.scatter(x=x,y=y,marker='square_dot',line_color='black',fill_color=None,size=20,line_width=2,legend_label='Source',level='overlay')
+			if parallax>0:
+				plot.scatter(x=x,y=y,marker='square_dot',line_color='black',fill_color=None,size=20,line_width=2,legend_label='Source',level='overlay')
+			else:
+				return None
 		else:
 			return None
 	
@@ -93,7 +96,10 @@ def get_plot(source=None,sources=None):
 			y=gmag+5*np.log10(parallax/1000)+5
 			
 			if not math.isnan(gmag) and not math.isnan(bpmag) and not math.isnan(rpmag) and not math.isnan(parallax):
-				plot.scatter(x=x,y=y,marker='square_dot',line_color='black',fill_color=None,size=10,line_width=2,legend_label='Sources',level='overlay')
+				if parallax>0:
+					plot.scatter(x=x,y=y,marker='square_dot',line_color='black',fill_color=None,size=10,line_width=2,legend_label='Sources',level='overlay')
+				else:
+					return None
 			else:
 				pass
 

{AstroToolkit-1.3.3 → AstroToolkit-1.3.5}/src/AstroToolkit/Timeseries/ztfanalysis.py

@@ -764,10 +764,12 @@ def get_analysis(dataset):
     from astropy.io import ascii, fits
     import pandas as pd
     
+    #dataset[1]['data']=None
+
     if isinstance(dataset,list):
         dataframes=[]
         for band in dataset:
-            if band!=None:
+            if band['data']!=None:
                 # collapse dictionary
                 for key in band['data']:
                     band[key]=band['data'][key]

{AstroToolkit-1.3.3 → AstroToolkit-1.3.5}/src/AstroToolkit/Tools.py

@@ -1,8 +1,6 @@
 '''
 Changelog:
-- Small changes to HRD overlay layering
-- updated to work with astroquery 0.4.7
-- bug fixes
+- added check for negative parallaxes in HRD plotting
 '''
 
 '''

{AstroToolkit-1.3.3 → AstroToolkit-1.3.5/src/AstroToolkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: AstroToolkit
-Version: 1.3.3
+Version: 1.3.5
 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
@@ -25,6 +25,7 @@ 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-1.3.3 → AstroToolkit-1.3.5}/src/AstroToolkit.egg-info/requires.txt

@@ -13,3 +13,4 @@ PyQt5_sip==12.13.0
 Requests==2.31.0
 scikit_learn==1.3.2
 scipy==1.10.1
+selenium==4.17.2