diff --git a/docs/tutorial.ipynb b/docs/tutorial.ipynb index 160663b..69332fc 100644 --- a/docs/tutorial.ipynb +++ b/docs/tutorial.ipynb @@ -50,11 +50,11 @@ { "data": { "text/html": [ - "
calistar v0.0.3\n",
+       "
calistar v0.0.4\n",
        "
\n" ], "text/plain": [ - "\u001b[1;35mcalistar v0.\u001b[0m\u001b[1;35m0.3\u001b[0m\n" + "\u001b[1;35mcalistar v0.\u001b[0m\u001b[1;35m0.4\u001b[0m\n" ] }, "metadata": {}, @@ -117,23 +117,6 @@ "XP continuous = True\n", "XP sampled = True\n", "RVS spectrum = False\n", - "Reading input file...me...\r" - ] - }, - { - "name": "stderr", - "output_type": "stream", - "text": [ - " 0/1 [00:00 Querying Simbad...\n", "\n", @@ -150,19 +133,23 @@ "2MASS Ks mag = 5.593 +/- 0.021\n", "\n", "ALLWISE source ID = J214521.98-124659.9\n", - "Separation between Gaia and ALLWISE source = 18.9 mas\n", + "Separation between Gaia and WISE source = 18.9 mas\n", "\n", "WISE W1 mag = 5.573 +/- 0.176\n", "WISE W2 mag = 5.452 +/- 0.052\n", "WISE W3 mag = 5.629 +/- 0.015\n", "WISE W4 mag = 5.481 +/- 0.043\n", "\n", + "-> Querying Washington Double Star catalog...\n", + "\n", + "Target not found in WDS catalog\n", + "\n", "Storing JSON output: target_dr3_6843672087120107264.json\n" ] } ], "source": [ - "target_prop = cal_star.target_star(write_json=True, get_gaiaxp=True)" + "target_prop = cal_star.target_star(write_json=True, get_gaiaxp=False)" ] }, { @@ -175,7 +162,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "{'Gaia ID': 6843672087120107264, 'Gaia release': 'DR3', 'Gaia epoch': 2016.0, 'Gaia RA': (326.3417007918157, 6.28893832779593e-06), 'Gaia Dec': (-12.783352283336647, 6.28893832779593e-06), 'Gaia pm RA': (94.11170797027064, 0.03547043353319168), 'Gaia pm Dec': (-0.4633855782241898, 0.025660403072834015), 'Gaia parallax': (24.527534260182925, 0.03544711321592331), 'GAIA/GAIA3.G': (6.585951805114746, 0.002761077445367911), 'GAIA/GAIA3.Gbp': (6.798026084899902, 0.0028371437114444007), 'GAIA/GAIA3.Grp': (6.21368932723999, 0.0038149464919949023), 'GAIA/GAIA3.Grvs': (6.067283630371094, 0.004563245456665754), 'Simbad ID': 'HD 206893', 'SpT': 'F5V', '2MASS/2MASS.J': (5.86899995803833, 0.023000000044703484), '2MASS/2MASS.H': (5.686999797821045, 0.03400000184774399), '2MASS/2MASS.Ks': (5.5929999351501465, 0.020999999716877937), 'WISE/WISE.W1': (5.572999954223633, 0.0430000014603138), 'WISE/WISE.W2': (5.452000141143799, 0.0430000014603138), 'WISE/WISE.W3': (5.629000186920166, 0.0430000014603138), 'WISE/WISE.W4': (5.480999946594238, 0.0430000014603138)}\n" + "{'Gaia ID': 6843672087120107264, 'Gaia release': 'DR3', 'Gaia epoch': 2016.0, 'Gaia RA': (326.3417007918157, 6.28893832779593e-06), 'Gaia Dec': (-12.783352283336647, 6.28893832779593e-06), 'Gaia pm RA': (94.11170797027064, 0.03547043353319168), 'Gaia pm Dec': (-0.4633855782241898, 0.025660403072834015), 'Gaia parallax': (24.527534260182925, 0.03544711321592331), 'GAIA/GAIA3.G': (6.585951805114746, 0.002761077445367911), 'GAIA/GAIA3.Gbp': (6.798026084899902, 0.0028371437114444007), 'GAIA/GAIA3.Grp': (6.21368932723999, 0.0038149464919949023), 'GAIA/GAIA3.Grvs': (6.067283630371094, 0.004563245456665754), 'Simbad ID': 'HD 206893', 'SpT': 'F5V', '2MASS/2MASS.J': (5.86899995803833, 0.023000000044703484), '2MASS/2MASS.H': (5.686999797821045, 0.03400000184774399), '2MASS/2MASS.Ks': (5.5929999351501465, 0.020999999716877937), 'WISE/WISE.W1': (5.572999954223633, 0.17599999904632568), 'WISE/WISE.W2': (5.452000141143799, 0.052000001072883606), 'WISE/WISE.W3': (5.629000186920166, 0.014999999664723873), 'WISE/WISE.W4': (5.480999946594238, 0.0430000014603138)}\n" ] } ], @@ -203,7 +190,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "63654f16af044b8d8497c51b70e6cdd1", + "model_id": "bf87cf9aa6f4431caca6a30e4c3f2a90", "version_major": 2, "version_minor": 0 }, @@ -319,7 +306,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "ccd340897dc14b4f96faa75bb8ef01be", + "model_id": "ce9ab061560342b2ae5791ccf41a7fe6", "version_major": 2, "version_minor": 0 }, diff --git a/setup.py b/setup.py index 3927c69..fe2b8cb 100644 --- a/setup.py +++ b/setup.py @@ -3,35 +3,35 @@ import pkg_resources import setuptools -with open('requirements.txt') as req_txt: +with open("requirements.txt") as req_txt: parse_req = pkg_resources.parse_requirements(req_txt) install_requires = [str(req) for req in parse_req] setuptools.setup( - name='calistar', - version='0.0.4', - description='Tool to search for a single calibration star', - long_description=open('README.rst').read(), - long_description_content_type='text/x-rst', - author='Tomas Stolker', - author_email='stolker@strw.leidenuniv.nl', - url='https://github.com/tomasstolker/calistar', - project_urls={'Documentation': 'https://calistar.readthedocs.io'}, - packages=setuptools.find_packages(include=['calistar', 'calistar.*']), - package_data={'calistar': ['data/*.json']}, + name="calistar", + version="0.0.4", + description="Tool to search for a single calibration star", + long_description=open("README.rst").read(), + long_description_content_type="text/x-rst", + author="Tomas Stolker", + author_email="stolker@strw.leidenuniv.nl", + url="https://github.com/tomasstolker/calistar", + project_urls={"Documentation": "https://calistar.readthedocs.io"}, + packages=setuptools.find_packages(include=["calistar", "calistar.*"]), + package_data={"calistar": ["data/*.json"]}, install_requires=install_requires, - tests_require=['pytest'], - license='MIT', + tests_require=["pytest"], + license="MIT", zip_safe=False, - keywords='calistar', + keywords="calistar", classifiers=[ - 'Development Status :: 4 - Beta', - 'Intended Audience :: Science/Research', - 'Topic :: Scientific/Engineering :: Astronomy', - 'License :: OSI Approved :: MIT License', - 'Natural Language :: English', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', + "Development Status :: 4 - Beta", + "Intended Audience :: Science/Research", + "Topic :: Scientific/Engineering :: Astronomy", + "License :: OSI Approved :: MIT License", + "Natural Language :: English", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", ], )