diff --git a/SolAster/examples/full_pipeline.ipynb b/SolAster/examples/full_pipeline.ipynb index 8720baa..8678743 100644 --- a/SolAster/examples/full_pipeline.ipynb +++ b/SolAster/examples/full_pipeline.ipynb @@ -14,101 +14,7 @@ }, { "cell_type": "code", - "execution_count": 1, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "Requirement already satisfied: astropy in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (4.2.1)\n", - "Requirement already satisfied: pyerfa in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from astropy) (1.7.3)\n", - "Requirement already satisfied: numpy>=1.17 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from astropy) (1.20.1)\n", - "Requirement already satisfied: sunpy[all] in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (3.0.2)\n", - "Requirement already satisfied: numpy>=1.16.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (1.20.1)\n", - "Requirement already satisfied: parfive[ftp]>=1.2.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (1.5.0)\n", - "Requirement already satisfied: astropy>=4.1.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (4.2.1)\n", - "Requirement already satisfied: asdf>=2.6.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (2.11.0)\n", - "Requirement already satisfied: pandas>=0.24.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (1.2.4)\n", - "Requirement already satisfied: dask[array]>=2.0.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (2021.4.0)\n", - "Requirement already satisfied: beautifulsoup4>=4.8.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (4.9.3)\n", - "Requirement already satisfied: glymur!=0.9.0,>=0.8.18 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (0.9.9)\n", - "Requirement already satisfied: h5netcdf>=0.8.1 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (1.0.0)\n", - "Requirement already satisfied: h5py>=3.1.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (3.6.0)\n", - "Requirement already satisfied: zeep>=3.4.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (4.1.0)\n", - "Requirement already satisfied: sqlalchemy>=1.3.4 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (1.4.7)\n", - "Requirement already satisfied: tqdm>=4.32.1 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (4.59.0)\n", - "Requirement already satisfied: matplotlib>=3.1.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (3.3.4)\n", - "Requirement already satisfied: drms>=0.6.1 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (0.6.2)\n", - "Requirement already satisfied: scipy>=1.3.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (1.6.2)\n", - "Requirement already satisfied: python-dateutil>=2.8.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (2.8.1)\n", - "Requirement already satisfied: scikit-image>=0.16.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sunpy[all]) (0.18.1)\n", - "Requirement already satisfied: asdf-standard>=1.0.1 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from asdf>=2.6.0->sunpy[all]) (1.0.1)\n", - "Requirement already satisfied: pyyaml>=3.10 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from asdf>=2.6.0->sunpy[all]) (5.4.1)\n", - "Requirement already satisfied: semantic-version>=2.8 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from asdf>=2.6.0->sunpy[all]) (2.9.0)\n", - "Requirement already satisfied: importlib-resources>=3 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from asdf>=2.6.0->sunpy[all]) (5.7.0)\n", - "Requirement already satisfied: jmespath>=0.6.2 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from asdf>=2.6.0->sunpy[all]) (1.0.0)\n", - "Requirement already satisfied: jsonschema>=4.0.1 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from asdf>=2.6.0->sunpy[all]) (4.4.0)\n", - "Requirement already satisfied: packaging>=16.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from asdf>=2.6.0->sunpy[all]) (20.9)\n", - "Requirement already satisfied: asdf-transform-schemas>=0.2.2 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from asdf>=2.6.0->sunpy[all]) (0.2.2)\n", - "Requirement already satisfied: pyerfa in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from astropy>=4.1.0->sunpy[all]) (1.7.3)\n", - "Requirement already satisfied: soupsieve>1.2 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from beautifulsoup4>=4.8.0->sunpy[all]) (2.2.1)\n", - "Requirement already satisfied: toolz>=0.8.2 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from dask[array]>=2.0.0->sunpy[all]) (0.11.1)\n", - "Requirement already satisfied: partd>=0.3.10 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from dask[array]>=2.0.0->sunpy[all]) (1.2.0)\n", - "Requirement already satisfied: fsspec>=0.6.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from dask[array]>=2.0.0->sunpy[all]) (0.9.0)\n", - "Requirement already satisfied: cloudpickle>=1.1.1 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from dask[array]>=2.0.0->sunpy[all]) (1.6.0)\n", - "Requirement already satisfied: setuptools in /Users/tervin/.local/lib/python3.8/site-packages (from glymur!=0.9.0,>=0.8.18->sunpy[all]) (58.2.0)\n", - "Requirement already satisfied: lxml in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from glymur!=0.9.0,>=0.8.18->sunpy[all]) (4.6.3)\n", - "Requirement already satisfied: zipp>=3.1.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from importlib-resources>=3->asdf>=2.6.0->sunpy[all]) (3.4.1)\n", - "Requirement already satisfied: pyrsistent!=0.17.0,!=0.17.1,!=0.17.2,>=0.14.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from jsonschema>=4.0.1->asdf>=2.6.0->sunpy[all]) (0.17.3)\n", - "Requirement already satisfied: attrs>=17.4.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from jsonschema>=4.0.1->asdf>=2.6.0->sunpy[all]) (20.3.0)\n", - "Requirement already satisfied: kiwisolver>=1.0.1 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from matplotlib>=3.1.0->sunpy[all]) (1.3.1)\n", - "Requirement already satisfied: pyparsing!=2.0.4,!=2.1.2,!=2.1.6,>=2.0.3 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from matplotlib>=3.1.0->sunpy[all]) (2.4.7)\n", - "Requirement already satisfied: cycler>=0.10 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from matplotlib>=3.1.0->sunpy[all]) (0.10.0)\n", - "Requirement already satisfied: pillow>=6.2.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from matplotlib>=3.1.0->sunpy[all]) (8.2.0)\n", - "Requirement already satisfied: six in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from cycler>=0.10->matplotlib>=3.1.0->sunpy[all]) (1.15.0)\n", - "Requirement already satisfied: pytz>=2017.3 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from pandas>=0.24.0->sunpy[all]) (2021.1)\n", - "Requirement already satisfied: aiohttp in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from parfive[ftp]>=1.2.0->sunpy[all]) (3.7.4.post0)\n", - "Requirement already satisfied: aioftp>=0.17.1 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from parfive[ftp]>=1.2.0->sunpy[all]) (0.18.1)\n", - "Requirement already satisfied: locket in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages/locket-0.2.1-py3.8.egg (from partd>=0.3.10->dask[array]>=2.0.0->sunpy[all]) (0.2.1)\n", - "Requirement already satisfied: networkx>=2.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from scikit-image>=0.16.0->sunpy[all]) (2.5)\n", - "Requirement already satisfied: imageio>=2.3.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from scikit-image>=0.16.0->sunpy[all]) (2.9.0)\n", - "Requirement already satisfied: tifffile>=2019.7.26 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from scikit-image>=0.16.0->sunpy[all]) (2020.10.1)\n", - "Requirement already satisfied: PyWavelets>=1.1.1 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from scikit-image>=0.16.0->sunpy[all]) (1.1.1)\n", - "Requirement already satisfied: decorator>=4.3.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from networkx>=2.0->scikit-image>=0.16.0->sunpy[all]) (5.0.6)\n", - "Requirement already satisfied: greenlet!=0.4.17 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from sqlalchemy>=1.3.4->sunpy[all]) (1.0.0)\n", - "Requirement already satisfied: isodate>=0.5.4 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from zeep>=3.4.0->sunpy[all]) (0.6.1)\n", - "Requirement already satisfied: cached-property>=1.3.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from zeep>=3.4.0->sunpy[all]) (1.5.2)\n", - "Requirement already satisfied: platformdirs>=1.4.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from zeep>=3.4.0->sunpy[all]) (2.5.1)\n", - "Requirement already satisfied: requests>=2.7.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from zeep>=3.4.0->sunpy[all]) (2.25.1)\n", - "Requirement already satisfied: requests-toolbelt>=0.7.1 in /Users/tervin/.local/lib/python3.8/site-packages (from zeep>=3.4.0->sunpy[all]) (0.9.1)\n", - "Requirement already satisfied: requests-file>=1.5.1 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from zeep>=3.4.0->sunpy[all]) (1.5.1)\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "Requirement already satisfied: certifi>=2017.4.17 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from requests>=2.7.0->zeep>=3.4.0->sunpy[all]) (2020.12.5)\n", - "Requirement already satisfied: chardet<5,>=3.0.2 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from requests>=2.7.0->zeep>=3.4.0->sunpy[all]) (4.0.0)\n", - "Requirement already satisfied: urllib3<1.27,>=1.21.1 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from requests>=2.7.0->zeep>=3.4.0->sunpy[all]) (1.26.4)\n", - "Requirement already satisfied: idna<3,>=2.5 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from requests>=2.7.0->zeep>=3.4.0->sunpy[all]) (2.10)\n", - "Requirement already satisfied: yarl<2.0,>=1.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from aiohttp->parfive[ftp]>=1.2.0->sunpy[all]) (1.7.0)\n", - "Requirement already satisfied: typing-extensions>=3.6.5 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from aiohttp->parfive[ftp]>=1.2.0->sunpy[all]) (3.7.4.3)\n", - "Requirement already satisfied: async-timeout<4.0,>=3.0 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from aiohttp->parfive[ftp]>=1.2.0->sunpy[all]) (3.0.1)\n", - "Requirement already satisfied: multidict<7.0,>=4.5 in /Users/tervin/opt/anaconda3/lib/python3.8/site-packages (from aiohttp->parfive[ftp]>=1.2.0->sunpy[all]) (5.2.0)\n" - ] - } - ], - "source": [ - "import sys\n", - "!{sys.executable} -m pip install astropy\n", - "!{sys.executable} -m pip install \"sunpy[all]\"" - ] - }, - { - "cell_type": "code", - "execution_count": 2, + "execution_count": null, "metadata": { "pycharm": { "name": "#%%\n" @@ -158,21 +64,13 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": null, "metadata": { "pycharm": { "name": "#%%\n" } }, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "Beginning calculation of values for csv file: 2022\n" - ] - } - ], + "outputs": [], "source": [ "# check input formats\n", "start_date, end_date, cadence, csv_name = utils.check_inputs(CsvDir.CALC, Inputs.start_date, Inputs.end_date,\n", @@ -217,66 +115,13 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": null, "metadata": { "pycharm": { "name": "#%%\n" } }, - "outputs": [ - { - "data": { - "application/vnd.jupyter.widget-view+json": { - "model_id": "16ee535d61654af59350809565bb8d1c", - "version_major": 2, - "version_minor": 0 - }, - "text/plain": [ - "Files Downloaded: 0%| | 0/3 [00:00 162\u001B[0;31m \u001B[0mpairs\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mread_file\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mos\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mfspath\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mfname\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0;34m**\u001B[0m\u001B[0mkwargs\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 163\u001B[0m \u001B[0;32mexcept\u001B[0m \u001B[0mException\u001B[0m \u001B[0;32mas\u001B[0m \u001B[0me\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;32m~/opt/anaconda3/lib/python3.8/site-packages/sunpy/io/file_tools.py\u001B[0m in \u001B[0;36mread_file\u001B[0;34m(filepath, filetype, **kwargs)\u001B[0m\n\u001B[1;32m 87\u001B[0m \u001B[0;32mif\u001B[0m \u001B[0mfilepath\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mendswith\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mextension\u001B[0m\u001B[0;34m)\u001B[0m \u001B[0;32mor\u001B[0m \u001B[0mfiletype\u001B[0m \u001B[0;32min\u001B[0m \u001B[0mextension\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m---> 88\u001B[0;31m \u001B[0;32mreturn\u001B[0m \u001B[0m_readers\u001B[0m\u001B[0;34m[\u001B[0m\u001B[0mreadername\u001B[0m\u001B[0;34m]\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mread\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mfilepath\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0;34m**\u001B[0m\u001B[0mkwargs\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 89\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;32m~/opt/anaconda3/lib/python3.8/site-packages/sunpy/io/fits.py\u001B[0m in \u001B[0;36mread\u001B[0;34m(filepath, hdus, memmap, **kwargs)\u001B[0m\n\u001B[1;32m 83\u001B[0m \u001B[0;32mtry\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m---> 84\u001B[0;31m \u001B[0mpairs\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mappend\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mHDPair\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mhdu\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mdata\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mheader\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 85\u001B[0m \u001B[0;32mexcept\u001B[0m \u001B[0;34m(\u001B[0m\u001B[0mKeyError\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mValueError\u001B[0m\u001B[0;34m)\u001B[0m \u001B[0;32mas\u001B[0m \u001B[0me\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;32m~/opt/anaconda3/lib/python3.8/site-packages/astropy/utils/decorators.py\u001B[0m in \u001B[0;36m__get__\u001B[0;34m(self, obj, owner)\u001B[0m\n\u001B[1;32m 757\u001B[0m \u001B[0;32melse\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m--> 758\u001B[0;31m \u001B[0mval\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mself\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mfget\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mobj\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 759\u001B[0m \u001B[0mobj\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0m__dict__\u001B[0m\u001B[0;34m[\u001B[0m\u001B[0mself\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0m_key\u001B[0m\u001B[0;34m]\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mval\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;32m~/opt/anaconda3/lib/python3.8/site-packages/astropy/io/fits/hdu/compressed.py\u001B[0m in \u001B[0;36mdata\u001B[0;34m(self)\u001B[0m\n\u001B[1;32m 1362\u001B[0m \u001B[0;31m# The data attribute is the image data (not the table data).\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m-> 1363\u001B[0;31m \u001B[0mdata\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mcompression\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mdecompress_hdu\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mself\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 1364\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;32m~/opt/anaconda3/lib/python3.8/site-packages/astropy/utils/decorators.py\u001B[0m in \u001B[0;36m__get__\u001B[0;34m(self, obj, owner)\u001B[0m\n\u001B[1;32m 757\u001B[0m \u001B[0;32melse\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m--> 758\u001B[0;31m \u001B[0mval\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mself\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mfget\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mobj\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 759\u001B[0m \u001B[0mobj\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0m__dict__\u001B[0m\u001B[0;34m[\u001B[0m\u001B[0mself\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0m_key\u001B[0m\u001B[0;34m]\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mval\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;32m~/opt/anaconda3/lib/python3.8/site-packages/astropy/io/fits/hdu/compressed.py\u001B[0m in \u001B[0;36mcompressed_data\u001B[0;34m(self)\u001B[0m\n\u001B[1;32m 1414\u001B[0m \u001B[0;31m# data) from the file, if there is any.\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m-> 1415\u001B[0;31m \u001B[0mcompressed_data\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0msuper\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mdata\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 1416\u001B[0m \u001B[0;32mif\u001B[0m \u001B[0misinstance\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mcompressed_data\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mnp\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mrec\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mrecarray\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;32m~/opt/anaconda3/lib/python3.8/site-packages/astropy/utils/decorators.py\u001B[0m in \u001B[0;36m__get__\u001B[0;34m(self, obj, owner)\u001B[0m\n\u001B[1;32m 757\u001B[0m \u001B[0;32melse\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m--> 758\u001B[0;31m \u001B[0mval\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mself\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mfget\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mobj\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 759\u001B[0m \u001B[0mobj\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0m__dict__\u001B[0m\u001B[0;34m[\u001B[0m\u001B[0mself\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0m_key\u001B[0m\u001B[0;34m]\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mval\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;32m~/opt/anaconda3/lib/python3.8/site-packages/astropy/io/fits/hdu/table.py\u001B[0m in \u001B[0;36mdata\u001B[0;34m(self)\u001B[0m\n\u001B[1;32m 398\u001B[0m \u001B[0;32mdef\u001B[0m \u001B[0mdata\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mself\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m--> 399\u001B[0;31m \u001B[0mdata\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mself\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0m_get_tbdata\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 400\u001B[0m \u001B[0mdata\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0m_coldefs\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mself\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mcolumns\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;32m~/opt/anaconda3/lib/python3.8/site-packages/astropy/io/fits/hdu/table.py\u001B[0m in \u001B[0;36m_get_tbdata\u001B[0;34m(self)\u001B[0m\n\u001B[1;32m 165\u001B[0m \u001B[0;31m# We have a heap; include it in the raw_data\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m--> 166\u001B[0;31m raw_data = self._get_raw_data(self._data_size, np.uint8,\n\u001B[0m\u001B[1;32m 167\u001B[0m self._data_offset)\n", - "\u001B[0;32m~/opt/anaconda3/lib/python3.8/site-packages/astropy/io/fits/hdu/base.py\u001B[0m in \u001B[0;36m_get_raw_data\u001B[0;34m(self, shape, code, offset)\u001B[0m\n\u001B[1;32m 519\u001B[0m \u001B[0;32melif\u001B[0m \u001B[0mself\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0m_file\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m--> 520\u001B[0;31m \u001B[0;32mreturn\u001B[0m \u001B[0mself\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0m_file\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mreadarray\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0moffset\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0moffset\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mdtype\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0mcode\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mshape\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0mshape\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 521\u001B[0m \u001B[0;32melse\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;32m~/opt/anaconda3/lib/python3.8/site-packages/astropy/io/fits/file.py\u001B[0m in \u001B[0;36mreadarray\u001B[0;34m(self, size, offset, dtype, shape)\u001B[0m\n\u001B[1;32m 329\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m--> 330\u001B[0;31m return np.ndarray(shape=shape, dtype=dtype, offset=offset,\n\u001B[0m\u001B[1;32m 331\u001B[0m buffer=self._mmap)\n", - "\u001B[0;31mTypeError\u001B[0m: buffer is too small for requested array", - "\nThe above exception was the direct cause of the following exception:\n", - "\u001B[0;31mOSError\u001B[0m Traceback (most recent call last)", - "\u001B[0;32m\u001B[0m in \u001B[0;36m\u001B[0;34m\u001B[0m\n\u001B[1;32m 27\u001B[0m \u001B[0;32melse\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 28\u001B[0m \u001B[0;31m# convert to map sequence\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m---> 29\u001B[0;31m \u001B[0mmap_seq\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0msunpy\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mmap\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mMap\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0msorted\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mgood_files\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 30\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 31\u001B[0m \u001B[0;31m# check for missing data types\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;32m~/opt/anaconda3/lib/python3.8/site-packages/sunpy/map/map_factory.py\u001B[0m in \u001B[0;36m__call__\u001B[0;34m(self, composite, sequence, silence_errors, *args, **kwargs)\u001B[0m\n\u001B[1;32m 332\u001B[0m \u001B[0;32mas\u001B[0m\u001B[0;31m \u001B[0m\u001B[0;31m`\u001B[0m\u001B[0mmemmap\u001B[0m\u001B[0;31m`\u001B[0m \u001B[0;32mfor\u001B[0m \u001B[0mFITS\u001B[0m \u001B[0mfiles\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 333\u001B[0m \"\"\"\n\u001B[0;32m--> 334\u001B[0;31m \u001B[0mdata_header_pairs\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mself\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0m_parse_args\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0;34m*\u001B[0m\u001B[0margs\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0msilence_errors\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0msilence_errors\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0;34m**\u001B[0m\u001B[0mkwargs\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 335\u001B[0m \u001B[0mnew_maps\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mlist\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 336\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;32m~/opt/anaconda3/lib/python3.8/site-packages/sunpy/map/map_factory.py\u001B[0m in \u001B[0;36m_parse_args\u001B[0;34m(self, silence_errors, *args, **kwargs)\u001B[0m\n\u001B[1;32m 243\u001B[0m \u001B[0;32mfor\u001B[0m \u001B[0marg\u001B[0m \u001B[0;32min\u001B[0m \u001B[0margs\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 244\u001B[0m \u001B[0;32mtry\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m--> 245\u001B[0;31m \u001B[0mdata_header_pairs\u001B[0m \u001B[0;34m+=\u001B[0m \u001B[0mself\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0m_parse_arg\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0marg\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0;34m**\u001B[0m\u001B[0mkwargs\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 246\u001B[0m \u001B[0;32mexcept\u001B[0m \u001B[0mNoMapsInFileError\u001B[0m \u001B[0;32mas\u001B[0m \u001B[0me\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 247\u001B[0m \u001B[0;32mif\u001B[0m \u001B[0;32mnot\u001B[0m \u001B[0msilence_errors\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;32m~/opt/anaconda3/lib/python3.8/site-packages/sunpy/util/functools.py\u001B[0m in \u001B[0;36mwrapper\u001B[0;34m(*args, **kwargs)\u001B[0m\n\u001B[1;32m 16\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 17\u001B[0m \u001B[0;32mdef\u001B[0m \u001B[0mwrapper\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0;34m*\u001B[0m\u001B[0margs\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0;34m**\u001B[0m\u001B[0mkwargs\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m---> 18\u001B[0;31m \u001B[0;32mreturn\u001B[0m \u001B[0mdispatcher\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mdispatch\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0margs\u001B[0m\u001B[0;34m[\u001B[0m\u001B[0;36m1\u001B[0m\u001B[0;34m]\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0m__class__\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0;34m*\u001B[0m\u001B[0margs\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0;34m**\u001B[0m\u001B[0mkwargs\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 19\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 20\u001B[0m \u001B[0mwrapper\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mdispatch\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mdispatcher\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mdispatch\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;32m~/opt/anaconda3/lib/python3.8/site-packages/sunpy/map/map_factory.py\u001B[0m in \u001B[0;36m_parse_path\u001B[0;34m(self, arg, **kwargs)\u001B[0m\n\u001B[1;32m 292\u001B[0m \u001B[0mpath\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0marg\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mexpanduser\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 293\u001B[0m \u001B[0;32mif\u001B[0m \u001B[0m_is_file\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mpath\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m--> 294\u001B[0;31m \u001B[0;32mreturn\u001B[0m \u001B[0mself\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0m_read_file\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mpath\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0;34m**\u001B[0m\u001B[0mkwargs\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 295\u001B[0m \u001B[0;32melif\u001B[0m \u001B[0m_is_dir\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mpath\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 296\u001B[0m \u001B[0mpairs\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0;34m[\u001B[0m\u001B[0;34m]\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;32m~/opt/anaconda3/lib/python3.8/site-packages/sunpy/map/map_factory.py\u001B[0m in \u001B[0;36m_read_file\u001B[0;34m(self, fname, **kwargs)\u001B[0m\n\u001B[1;32m 163\u001B[0m \u001B[0;32mexcept\u001B[0m \u001B[0mException\u001B[0m \u001B[0;32mas\u001B[0m \u001B[0me\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 164\u001B[0m \u001B[0mmsg\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0;34mf\"Failed to read {fname}.\"\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m--> 165\u001B[0;31m \u001B[0;32mraise\u001B[0m \u001B[0mIOError\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mmsg\u001B[0m\u001B[0;34m)\u001B[0m \u001B[0;32mfrom\u001B[0m \u001B[0me\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 166\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 167\u001B[0m \u001B[0mnew_pairs\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0;34m[\u001B[0m\u001B[0;34m]\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;31mOSError\u001B[0m: Failed to read /Users/tervin/sunpy/data/hmi_ic_45s_2022_01_26_06_01_30_tai_continuum.fits." - ] - } - ], + "outputs": [], "source": [ "for i, date in enumerate(dates_list):\n", " # convert the date to a string -- required for use in csv file\n", @@ -554,7 +399,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3 (ipykernel)", "language": "python", "name": "python3" }, @@ -568,7 +413,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.8" + "version": "3.8.0" } }, "nbformat": 4, diff --git a/SolAster/tools/__init__.py b/SolAster/tools/__init__.py index 5146ef3..a3632d1 100644 --- a/SolAster/tools/__init__.py +++ b/SolAster/tools/__init__.py @@ -8,7 +8,7 @@ from SolAster.tools.lbc_funcs import get_u, get_v, limb_polynomial -from SolAster.tools.rvs import rvs +from SolAster.tools.rvs import * from SolAster.tools.settings import BaseDir, CsvDir, ImgDir, Scaling, HARPSN, NEID diff --git a/SolAster/tools/lbc_funcs.py b/SolAster/tools/lbc_funcs.py index 0486878..fc9e982 100644 --- a/SolAster/tools/lbc_funcs.py +++ b/SolAster/tools/lbc_funcs.py @@ -17,13 +17,13 @@ def get_u(ll): Parameters ---------- - ll : float + ll: float wavelength Returns ------- - vl : float - coefficient v based on wavelength + ul: float + coefficient u based on wavelength """ @@ -45,12 +45,12 @@ def get_v(ll): Parameters ---------- - ll : float + ll: float wavelength Returns ------- - vl : float + vl: float coefficient v based on wavelength """ @@ -69,20 +69,19 @@ def get_v(ll): def limb_polynomial(imap): """ - function to calculate limb darkening correction polynomial based on IDl function: - https://hesperia.gsfc.nasa.gov/ssw/gen/idl/solar/darklimb_correct.pro - - Parameters - ---------- - imap - UNCORRECTED Sunpy map object (Intensitygram) - - Returns - ------- - Lij : array_like - limb-darkening polynomial array - - """ + function to calculate limb darkening correction polynomial based on IDl function: + https://hesperia.gsfc.nasa.gov/ssw/gen/idl/solar/darklimb_correct.pro + Parameters + ---------- + imap: map type + UNCORRECTED Sunpy map object (Intensitygram) + + + Returns + ------- + Lij: array_like + limb-darkening polynomial array + """ # get data data = imap.data diff --git a/mkdocs/docs/install.md b/mkdocs/docs/install.md index f16eebb..d39cc7a 100644 --- a/mkdocs/docs/install.md +++ b/mkdocs/docs/install.md @@ -2,10 +2,10 @@ # Build conda environment -* update dependencies in conda_env.yml [file](conda_env.yml) +* update dependencies in conda_env.yml [file](../conda_env.yml) * run the following from the folder containing the .yml file * ``conda env create -f conda_env.yml`` -* to add new dependencies, update conda_env.yml [file](conda_env.yml) +* to add new dependencies, update conda_env.yml [file](../conda_env.yml) * run the following from the folder containing the .yml file * ``conda env update -f conda_env.yml`` diff --git a/mkdocs/docs/package/coord_funcs.md b/mkdocs/docs/package/coord_funcs.md index 126ce92..92d9716 100644 --- a/mkdocs/docs/package/coord_funcs.md +++ b/mkdocs/docs/package/coord_funcs.md @@ -1,2 +1,6 @@ # Coordinate Transformations Module -::: SolAster.tools.coord_funcs \ No newline at end of file + +::: SolAster.tools.coord_funcs + rendering: + show_root_heading: false + show_source: false \ No newline at end of file diff --git a/mkdocs/mkdocs.yml b/mkdocs/mkdocs.yml index c3e0ee6..3a45936 100644 --- a/mkdocs/mkdocs.yml +++ b/mkdocs/mkdocs.yml @@ -60,6 +60,8 @@ plugins: ignore_h1_titles: True - mkdocstrings: docstring_style: numpy +# watch: +# - SolAster/SolAster # extensions markdown_extensions: