PyThea 0.13.0__tar.gz → 1.0.0__tar.gz

{pythea-0.13.0 → pythea-1.0.0}/CHANGELOG.md

@@ -1,3 +1,29 @@
+# v1.0.0 (19-Nov-2024)
+
+## Features
+ - Adds imaging data from Solar Orbiter's SOLOHi.
+ - Implements offline fits file loading from local database.
+
+## Minor Changes
+ - Updates Test figure hashes.
+ - Final changes in README before the major release.
+
+ ## Bug Fixes
+ - Fixes a temporary bug with JSOC and AIA prep
+ - Fixes potential bug with maps loading into map sequence.
+ - Fixes a bug when fits database is selected but no files downloaded.
+ - Fixes a bug with the maps clims.
+
+# v0.14.0 (03-Oct-2024)
+
+## Features
+ - Adds imaging data from Solar Orbiter EUI and METIS.
+ - Implements offline fits file loading from local database.
+
+## Minor Changes
+ - Simplifies the configuration of the database directory.
+ - Improves Parker Spiral visualization.
+
 # v0.13.0 (14-Jul-2024)
 
 ## Features

{pythea-0.13.0 → pythea-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyThea
-Version: 0.13.0
+Version: 1.0.0
 Summary: PyThea: A software package to reconstruct the 3D structure of CMEs and shock waves
 Home-page: https://github.com/AthKouloumvakos/PyThea
 Author: Athanasios Kouloumvakos
@@ -29,6 +29,7 @@ Requires-Dist: astroquery
 Requires-Dist: jplephem
 Requires-Dist: numexpr
 Requires-Dist: sunpy==5.1.2
+Requires-Dist: sunpy_soar
 Requires-Dist: parfive==2.1.0
 Requires-Dist: pooch
 Requires-Dist: matplotlib
@@ -53,7 +54,7 @@ Requires-Dist: pytest-mpl
 ![flake8](https://github.com/AthKouloumvakos/PyThea/actions/workflows/flake8.yml/badge.svg)
 ![pytest](https://github.com/AthKouloumvakos/PyThea/actions/workflows/pytest.yml/badge.svg)
 
-_PyThea_ is an open-source software package that can be used to reconstruct the 3D structure of Coronal Mass Ejections (CMEs) and shock waves and determine their kinematics using remote-sensing observations. The tool implements the Graduated Cylindrical Shell (GCS) model that can be used to reconstruct CMEs and two geometrical models, namely a spheroid and ellipsoid model to reconstruct shock waves. It also implements remote-sensing observations from multiple viewpoints such as the Solar and Heliospheric Observatory (SoHO) and Solar Terrestrial Relations Observatory (STEREO).
+_PyThea_ is an open-source software package that can be used to reconstruct the 3D structure of Coronal Mass Ejections (CMEs) and shock waves and determine their kinematics using remote-sensing observations. The tool implements the Graduated Cylindrical Shell (GCS) model that can be used to reconstruct CMEs and two geometrical models, namely a spheroid and ellipsoid model to reconstruct shock waves. It also implements remote-sensing observations from multiple viewpoints such as the Solar and Heliospheric Observatory (SoHO), Solar Terrestrial Relations Observatory (STEREO), and Parker Solar Probe.
 
 ## 💾 Installation
 
@@ -152,3 +153,7 @@ If you use _PyThea_ for scientific work or research presented in a publication,
 ## ⓘ The mythology of Thea:
 
 In Greek mythology, Thea, also called Euryphaessa "wide-shining", is the Titaness of sight and the shining light of the clear blue sky. Her brother/consort is Hyperion, a Titan and god of the sun, and together they are the parents of Helios (the Sun), Selene (the Moon), and Eos (the Dawn).
+
+## Development Support:
+
+The lead author of this software package Athanasios Kouloumvakos acknowledges financial support from NASA Grant 80NSSC24K0071   for the further development and improvement of PyThea during 2024. This grant was part of the NASA Headquarters Heliophysics Tools and Methods Program in response to NASA ROSES–2022 (NNH22ZDA001N).

{pythea-0.13.0 → pythea-1.0.0}/PyThea/PyThea_app.py

@@ -39,6 +39,7 @@ from PyThea.modules import (date_and_event_selection, figure_streamlit,
 from PyThea.sunpy_dev.map.maputils import get_closest, maps_clims
 from PyThea.utils import (download_fits, load_fits, model_fittings,
                           plot_fitting_model, single_imager_maps_process)
+from PyThea.utils_database import get_fits_filenames_from_database
 from PyThea.version import version
 
 
@@ -84,6 +85,7 @@ def footer_text():
             More imaging data have been added:
             - SDO/AIA images from 211A channel.
             - PSP/WISPR inner and outer telescope images.
+            - SolO/EUI, METIS, and HI(tiles 1&2) images.
             ''', icon='ℹ️')
     st.warning('''
            **NOTE: From PyThea >0.8.1 the JSON fitting files will be slightly different from the old ones.**
@@ -295,7 +297,15 @@ def run():
             if imager not in st.session_state.map_:
                 timerange = a.Time(st.session_state.date_process + datetime.timedelta(hours=imaging_time_range[0]),
                                    st.session_state.date_process + datetime.timedelta(hours=imaging_time_range[1]))
-                downloaded_files = download_fits(timerange, imager)
+
+                if st.session_state.offline_mode is False:
+                    downloaded_files = download_fits(timerange, imager)
+                elif st.session_state.offline_mode is True:
+                    progress_bar.desc = f'Load {imager} images from local database.'
+                    event_id = st.session_state.event_selected.replace('-', '').replace(':', '').replace('|', 'D').replace('.', 'p') \
+                        + 'M' + st.session_state.geometrical_model
+                    downloaded_files = get_fits_filenames_from_database(event_id, timerange, imager)
+
                 st.session_state.map_[imager] = load_fits(downloaded_files)
                 st.session_state.map_[imager] = single_imager_maps_process(st.session_state.map_[imager],
                                                                            **selected_imagers.imager_dict[imager]['process'],

{pythea-0.13.0 → pythea-1.0.0}/PyThea/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.13.0'
-__version_tuple__ = version_tuple = (0, 13, 0)
+__version__ = version = '1.0.0'
+__version_tuple__ = version_tuple = (1, 0, 0)

{pythea-0.13.0 → pythea-1.0.0}/PyThea/config/__init__.py

@@ -1,3 +1,8 @@
+import os
+from pathlib import Path
+
 from PyThea.config.config_sliders import *
 from PyThea.config.selected_bodies import *
 from PyThea.config.selected_imagers import *
+
+database_dir_default = os.path.join(Path.home(), 'PyThea')

{pythea-0.13.0 → pythea-1.0.0}/PyThea/config/selected_imagers.py

@@ -4,6 +4,7 @@
 
 '''
 import astropy.units as u
+import sunpy_soar  # noqa
 from sunpy.net import attrs as a
 
 imager_dict = {}
@@ -71,3 +72,18 @@ imager_dict['WISPR1'] = {'fido': (a.Instrument.wispr, a.Detector.inner),
 imager_dict['WISPR2'] = {'fido': (a.Instrument.wispr, a.Detector.outer),
                          'process': {'dimensions': (960*u.pixel, 1024*u.pixel), 'processing_level': 3, 'superpixel': 2},
                          'source': 'PSP', 'instrument': 'WISPR', 'detector': 'Outer'}
+
+imager_dict['EUI-FSI'] = {'fido': (a.Instrument('EUI'), a.soar.Product('EUI-FSI174-IMAGE'), a.Level(2)),
+                          'process': {'superpixel': 1},
+                          'source': 'SOLO', 'instrument': 'EUI-FSI', 'wavelength': '174'}
+
+imager_dict['METIS'] = {'fido': (a.Instrument('METIS'), a.soar.Product('METIS-VL-TB'), a.Level(2)),
+                        'process': {'dimensions': (1024*u.pixel, 1024*u.pixel), 'superpixel': 2},
+                        'source': 'SOLO', 'instrument': 'METIS', 'detector': 'VLD', 'wavelength': 'TB'}
+
+for tile in range(1, 5):
+    z = 'T' if tile in [1, 2] else 'G'
+    imager_dict[f'SOLOHI-T{tile}'] = {'fido': (a.Instrument('SOLOHI'),
+                                               a.soar.Product(f'SOLOHI-{tile}F{z}'), a.Level(2)),
+                                      'process': {'superpixel': 2},
+                                      'source': 'SOLO', 'instrument': 'SOLOHI', 'detector': f'T{tile}'}

{pythea-0.13.0 → pythea-1.0.0}/PyThea/data/sample_data.py

@@ -1,13 +1,13 @@
 import os
-from pathlib import Path
 
 import pooch
 
-database_dir = os.path.join(Path.home(), 'PyThea')
+from PyThea.config import database_dir_default
+
 github_main_url = 'https://github.com/AthKouloumvakos/PyThea-sample-data'
 
 aia_sample_data = pooch.create(
-    path=os.path.join(database_dir, 'sample_data'),  # The cache folder
+    path=os.path.join(database_dir_default, 'sample_data'),  # The cache folder
     base_url=f'{github_main_url}/raw/main/data/',  # The remote data url on Github
     registry={
         'aia_lev1_1600a_2012_06_06t04_07_29_12z_image_lev1.fits': 'sha256:7e88d8a277ad3dd111c1bcff3c3936d6d5ef5186e05b4bfa7749ee43c05577d5',
@@ -16,7 +16,7 @@ aia_sample_data = pooch.create(
 )
 
 stereo_sample_data = pooch.create(
-    path=os.path.join(database_dir, 'sample_data'),  # The cache folder
+    path=os.path.join(database_dir_default, 'sample_data'),  # The cache folder
     base_url=f'{github_main_url}/raw/main/data/',  # The remote data url on Github
     registry={
         '20120622_235400_d4c2a.fts': 'sha256:940680fe8bea754c9859170585d8299b9b049b631155435a31ecacf5b702d9cf',
@@ -27,7 +27,7 @@ stereo_sample_data = pooch.create(
 )
 
 wispr_sample_data = pooch.create(
-    path=os.path.join(database_dir, 'sample_data'),  # The cache folder
+    path=os.path.join(database_dir_default, 'sample_data'),  # The cache folder
     base_url=f'{github_main_url}/raw/main/data/',  # The remote data url on Github
     registry={
         'psp_l3_wispr_20210808t103707_v1_1211.fits': 'sha256:85035693c4677e8fa8a3e61b8051d6f0a46e96806b5b0cbdb3efa77652308bda',
@@ -36,7 +36,7 @@ wispr_sample_data = pooch.create(
 )
 
 json_fitting_file_sample_data = pooch.create(
-    path=os.path.join(database_dir, 'sample_data'),  # The cache folder
+    path=os.path.join(database_dir_default, 'sample_data'),  # The cache folder
     base_url=f'{github_main_url}/raw/main/data/',  # The remote data url on Github
     registry={
         'FLX1p0D20211028T153500MEllipsoid.json': 'sha256:34fced8530875110117ba27a73541d3acd0c90bc8fca99367c1ec4cdfc05ce86',

{pythea-0.13.0 → pythea-1.0.0}/PyThea/extensions/Parker_spirals/utils.py

@@ -41,3 +41,5 @@ def plot_parker_spiral(axis, map, bodies, sw_speed=350 * (u.km / u.second)):
             axis.plot_coord(spiral_coord[0], markersize=16, linewidth=10, marker='+', color='white')
 
         axis.plot_coord(spiral_coord[0], markersize=3, linewidth=4, marker='s', color=bodies_dict[body][1])
+
+        axis.plot_coord(spiral_coord[-1], markersize=8, linewidth=6, marker='x', color=bodies_dict[body][1])

{pythea-0.13.0 → pythea-1.0.0}/PyThea/modules.py

@@ -24,6 +24,7 @@ import astropy.units as u
 from sunpy.net import attrs as a
 
 from PyThea.callbacks import change_fitting_sliders, change_long_lat_sliders
+from PyThea.config import database_dir_default
 from PyThea.config.config_sliders import sliders_dict as sd
 from PyThea.extensions.hek.utils import plot_hek
 from PyThea.extensions.Parker_spirals.utils import plot_parker_spiral
@@ -121,6 +122,10 @@ def date_and_event_selection(st):
 
             st.rerun()
 
+    st.session_state.offline_mode = st.sidebar.checkbox('Work with offline mode active?', value=False)
+    if st.session_state.offline_mode:
+        st.sidebar.info(f'Fits files will be loaded from PyThea\'s database directory: {database_dir_default}', icon='ℹ️')
+
 
 def fitting_and_slider_options_container(st):
     """

{pythea-0.13.0 → pythea-1.0.0}/PyThea/sunpy_dev/extern/sunkit_instruments/aia/utils.py

@@ -1,3 +1,4 @@
+import warnings
 from astropy.time import TimeDelta
 from aiapy.calibrate import fix_observer_location, update_pointing
 
@@ -5,7 +6,11 @@ __all__ = ['prep_aia']
 
 
 def prep_aia(map_sequence):
-    map_sequence = [update_pointing(tmap) for tmap in map_sequence]
+    try:
+        map_sequence = [update_pointing(tmap) for tmap in map_sequence]
+    except:
+        warnings.warn('Prepare AIA maps failed, script proceeded without update_pointing. Check connection with JSOC.', UserWarning)
+
     map_sequence = [fix_observer_location(tmap) for tmap in map_sequence]
 
     for map_ in map_sequence:

{pythea-0.13.0 → pythea-1.0.0}/PyThea/sunpy_dev/map/maputils.py

@@ -18,6 +18,16 @@ __all__ = ['maps_sequence_processing', 'get_closest', 'normalize_exposure',
            'prepare_maps', 'difference_maps', 'mask_occulter']
 
 
+def check_maps_sequence(map_sequence):
+    if map_sequence:
+        if isinstance(map_sequence, MapSequence):
+            return map_sequence
+        else:
+            return sunpy.map.Map(map_sequence, sequence=True)
+    else:
+        return []
+
+
 def maps_sequence_processing(map_sequence, **kwargs):
     """
     Returns a sequence of maps which is processed as plain images, running or base difference images.
@@ -36,6 +46,7 @@ def maps_sequence_processing(map_sequence, **kwargs):
         A SunPy map.
     """
 
+    map_sequence = check_maps_sequence(map_sequence)
     if len(map_sequence) == 0:
         return []
 
@@ -139,6 +150,7 @@ def filter_maps(map_sequence, **kwargs):
 
     '''
 
+    map_sequence = check_maps_sequence(map_sequence)
     if len(map_sequence) == 0:
         return []
 
@@ -155,11 +167,7 @@ def filter_maps(map_sequence, **kwargs):
         map_sequence = [tmap for tmap in map_sequence if tmap.meta['polar'] == kwargs['polar']]
 
     if len(map_sequence) != 0:
-        if isinstance(map_sequence, MapSequence):
-            return map_sequence
-        else:
-            sequence_final = sunpy.map.Map(map_sequence, sequence=True)
-
+        sequence_final = check_maps_sequence(map_sequence)
     else:
         sequence_final = []
 
@@ -188,6 +196,7 @@ def prepare_maps(map_sequence, **kwargs):
 
     '''
 
+    map_sequence = check_maps_sequence(map_sequence)
     if len(map_sequence) == 0:
         return []
 
@@ -246,6 +255,7 @@ def difference_maps(smapi, smapm):
     if smapm.exposure_time != 1*u.second:
         smapm = normalize_exposure(smapm)
     smap_difference = smapi.data - smapm.data
+
     return sunpy.map.Map(smap_difference, smapi.meta)
 
 
@@ -300,9 +310,16 @@ def mask_occulter(smap, apply_mask=True, mask_value=0):
 
 
 def maps_clims(images):
-    if images[1].instrument == 'WISPR':
-        if images[1].detector == 'Outer':
+    i = 0 if len(images) < 2 else 1
+
+    if images[i].instrument == 'WISPR':
+        if images[i].detector == 'Outer':
             return [14., 14.]
-        elif images[1].detector == 'Inner':
+        elif images[i].detector == 'Inner':
             return [13., 13.]
-    return [np.nanquantile(images[1].data, 0.20)-10, np.nanquantile(images[1].data, 0.80)+10]
+    elif images[i].instrument == 'Metis':
+        return [12.80, 13.00]
+    elif images[i].instrument.startswith('SoloHI'):
+        return [13.95, 14.05]
+
+    return [np.nanquantile(images[i].data, 0.20)-10, np.nanquantile(images[i].data, 0.80)+10]

{pythea-0.13.0 → pythea-1.0.0}/PyThea/test/Pythea_test.py

@@ -8,7 +8,8 @@ export PYTHONPATH="${PYTHONPATH}:{top_level_dir_that_pythea_lives}/PyThea"
 """
 
 import os
-from pathlib import Path
+
+from PyThea.config import database_dir_default
 
 
 def test_database_dir_exists():
@@ -20,5 +21,4 @@ def test_database_dir_exists():
         print("Skipping test as it's running in GitHub Actions.")
         return
 
-    database_dir = os.path.join(Path.home(), 'PyThea')
-    assert os.path.exists(database_dir), f"PyThea's database directory '{database_dir}' does not exist."
+    assert os.path.exists(database_dir_default), f"PyThea's database directory '{database_dir_default}' does not exist."

{pythea-0.13.0 → pythea-1.0.0}/PyThea/test/figure_hashes.json

@@ -1,9 +1,9 @@
 {
   "PyThea.test.test_figures.test_ellipsoid_on_AIA_venus": "f1ff774b483a8c934c9353c552278c8823216fc7d9dad4ccc00c74be3f30c4c3",
-  "PyThea.test.test_figures.test_ellipsoid_on_AIA_mercury": "f6afda1c769a061b7ab1fc64c4e9c0f4658cdb97c3be83828ba5d98bf1bb182c",
+  "PyThea.test.test_figures.test_ellipsoid_on_AIA_mercury": "a70589cd9c052d80532df5f9fbbc6d857333dcd3e2e7acfbe0e73f6b98a2a6ef",
   "PyThea.test.test_figures.test_ellipsoid_on_STEREO_COR1_venus": "18a3af72e9da5b60e435f83ee3ef3f8cd0eb437eaef463329552ff56968f12ff",
   "PyThea.test.test_figures.test_ellipsoid_on_STEREO_COR2_three_planets": "231d5635f57c4d66556674a83f6cbcef7dc94b51846e977c4c2dc3dc244096ac",
-  "PyThea.test.test_figures.test_kinematics_figure": "83e060de53b57e9d34fe50111ba60a44f7c7c7b20faae9a4381654ef1c9ea72d"
+  "PyThea.test.test_figures.test_kinematics_figure": "83e060de53b57e9d34fe50111ba60a44f7c7c7b20faae9a4381654ef1c9ea72d",
   "PyThea.test.test_figures.test_ellipsoid_on_WISPR_Inner_Venus": "8d831b43b0c789cacfcff8386c00af0707bb68d64fca16c6188deca93d3cba87",
   "PyThea.test.test_figures.test_ellipsoid_on_WISPR_Outer_Mercury": "f94c444f2c6f00cd5dd5deff394d0e233c9e720413fd5570b306b262915c9732"
 }

{pythea-0.13.0 → pythea-1.0.0}/PyThea/utils.py

@@ -25,7 +25,6 @@ import os
 import re
 import warnings
 from copy import copy
-from pathlib import Path
 
 import astropy.units as u
 import matplotlib.colors as colors
@@ -48,6 +47,7 @@ from sunpy.net import attrs as a
 from sunpy.time import parse_time
 from sunpy.visualization import drawing
 
+from PyThea.config import database_dir_default
 from PyThea.config.selected_bodies import bodies_dict as bodies_dict_default
 from PyThea.config.selected_imagers import imager_dict as imager_dict_default
 from PyThea.geometrical_models import ellipsoid, gcs, spheroid
@@ -56,8 +56,6 @@ from PyThea.sunpy_dev.map.maputils import (filter_maps,
                                            prepare_maps)
 from PyThea.version import version
 
-database_dir_default = os.path.join(Path.home(), 'PyThea')
-
 
 def get_hek_flare(timerange, thresshold='B1.0'):
     """
@@ -130,7 +128,7 @@ def make_figure(map, cmap='Greys_r', clim=[-20, 20], clip_model=True, **kwargs):
     if median_filter_value != 1:
         map = sunpy.map.Map(median_filter(map.data, size=int(median_filter_value)), map.meta)
 
-    if map.instrument == 'WISPR':
+    if map.instrument in ['WISPR', 'Metis'] or map.instrument.startswith('SoloHI'):
         clim = [-10**-clim[0], 10**-clim[1]]
 
     if cmap == 'default':
@@ -154,9 +152,20 @@ def make_figure(map, cmap='Greys_r', clim=[-20, 20], clip_model=True, **kwargs):
     if cref.Ty > 0:
         axis.invert_yaxis()
 
-    axis.set_title(re.sub(r'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}',
-                          ' $T_{AGV}:$' + parse_time(map.date_average).strftime('%Y-%m-%d %H:%M:%S'),
-                          map.latex_name), fontsize=10, pad=8)
+    if map.instrument == 'SoloHI':
+        title = 'SoloHI' + f' Tile-{map.detector}' ' $T_{AGV}:$' + parse_time(map.date_average).strftime('%Y-%m-%d %H:%M:%S')
+    elif map.instrument == 'Metis':
+        title = re.sub(r'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}',
+                       ' $T_{AGV}:$' + parse_time(map.date_average).strftime('%Y-%m-%d %H:%M:%S'),
+                       map.latex_name.replace('VLD', 'METIS-VDL'))
+    else:
+        title = re.sub(r'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}',
+                       ' $T_{AGV}:$' + parse_time(map.date_average).strftime('%Y-%m-%d %H:%M:%S'),
+                       map.latex_name)
+    print(map.instrument)
+    print(map.latex_name)
+    axis.set_title(title,
+                   fontsize=10, pad=8)
 
     return fig, axis
 
@@ -275,7 +284,7 @@ def download_fits(timerange, imager, imager_dict=None, database_dir=None):
         'detector' (optional), and 'wavelength' (optional). The default imager_dict is from
         PyThea.config.selected_imagers.import imager_dict.
     database_dir : str, optional
-        The base directory where the data will be saved. The default is os.path.join(Path.home(), 'PyThea').
+        The base directory where the data will be saved. The default is database_dir_default from PyThea.config.
 
     Returns
     -------
@@ -340,6 +349,8 @@ def load_fits(files):
         for file_path in files:
             try:
                 map_ = sunpy.map.Map(file_path)
+                if isinstance(map_, list):  # Added because of METIS
+                    map_ = map_[0]
                 map_.meta['fits_file'] = os.path.basename(file_path)
                 maps_.append(map_)
             except RuntimeError as err:

pythea-1.0.0/PyThea/utils_database.py

@@ -0,0 +1,94 @@
+"""
+    PyThea: A software package to reconstruct the 3D structure of CMEs and
+    shock waves using multi-viewpoint remote-sensing observations.
+    Copyright (C) 2021  Athanasios Kouloumvakos
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+import collections.abc
+import json
+import os
+import re
+
+from PyThea.config import database_dir_default
+from PyThea.config.selected_imagers import imager_dict
+from PyThea.utils import download_fits
+
+
+def create_nested_dict(k, v):
+    if len(k) == 0:
+        return v
+    else:
+        return {k[0]: create_nested_dict(k[1:], v)}
+
+
+def load_nested_dict(k, d):
+    if len(k) == 0:
+        return d
+    else:
+        if k[0] in d:
+            return load_nested_dict(k[1:], d[k[0]])
+        else:
+            return None
+
+
+def update_nested_dict(d, u):
+    for k, v in u.items():
+        if isinstance(v, collections.abc.Mapping):
+            d[k] = update_nested_dict(d.get(k, {}), v)
+        else:
+            d[k] = v
+    return d
+
+
+def get_fits_filenames_from_database(event_id, timerange, imager):
+
+    db_args = [imager_dict[imager]['source'],
+               imager_dict[imager]['instrument'],
+               imager_dict[imager].get('detector', imager_dict[imager].get('wavelength'))]
+
+    # name of the JSON file with the database
+    file_id = re.search(r'D(.*?)(?=T)', event_id).group(1)
+    filename = os.path.join(database_dir_default, 'data_manager', f'{file_id}_fits_filenames.json')
+
+    if not os.path.isfile(filename):
+        # create file if it doesn't exist
+        with open(filename, 'w') as f:
+            json.dump({}, f)
+
+    # load data from file
+    with open(filename, 'r') as f:
+        database_data = json.load(f)
+
+    downloaded_files = None
+
+    if str(timerange) in database_data:
+        downloaded_files = load_nested_dict(db_args, database_data[str(timerange)])
+
+    if downloaded_files is None:
+        downloaded_files = download_fits(timerange, imager)
+        if not downloaded_files:
+            return None
+        nested_dict_ = create_nested_dict(db_args, downloaded_files.data)
+        nested_dict_ = {str(timerange): nested_dict_}
+
+        # dictionary stored in JSON file
+        database_data = update_nested_dict(database_data, nested_dict_)
+
+        # write updated data to file
+        with open(filename, 'w') as f:
+            json.dump(database_data, f, indent=4)
+
+    return downloaded_files

{pythea-0.13.0 → pythea-1.0.0}/PyThea.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyThea
-Version: 0.13.0
+Version: 1.0.0
 Summary: PyThea: A software package to reconstruct the 3D structure of CMEs and shock waves
 Home-page: https://github.com/AthKouloumvakos/PyThea
 Author: Athanasios Kouloumvakos
@@ -29,6 +29,7 @@ Requires-Dist: astroquery
 Requires-Dist: jplephem
 Requires-Dist: numexpr
 Requires-Dist: sunpy==5.1.2
+Requires-Dist: sunpy_soar
 Requires-Dist: parfive==2.1.0
 Requires-Dist: pooch
 Requires-Dist: matplotlib
@@ -53,7 +54,7 @@ Requires-Dist: pytest-mpl
 ![flake8](https://github.com/AthKouloumvakos/PyThea/actions/workflows/flake8.yml/badge.svg)
 ![pytest](https://github.com/AthKouloumvakos/PyThea/actions/workflows/pytest.yml/badge.svg)
 
-_PyThea_ is an open-source software package that can be used to reconstruct the 3D structure of Coronal Mass Ejections (CMEs) and shock waves and determine their kinematics using remote-sensing observations. The tool implements the Graduated Cylindrical Shell (GCS) model that can be used to reconstruct CMEs and two geometrical models, namely a spheroid and ellipsoid model to reconstruct shock waves. It also implements remote-sensing observations from multiple viewpoints such as the Solar and Heliospheric Observatory (SoHO) and Solar Terrestrial Relations Observatory (STEREO).
+_PyThea_ is an open-source software package that can be used to reconstruct the 3D structure of Coronal Mass Ejections (CMEs) and shock waves and determine their kinematics using remote-sensing observations. The tool implements the Graduated Cylindrical Shell (GCS) model that can be used to reconstruct CMEs and two geometrical models, namely a spheroid and ellipsoid model to reconstruct shock waves. It also implements remote-sensing observations from multiple viewpoints such as the Solar and Heliospheric Observatory (SoHO), Solar Terrestrial Relations Observatory (STEREO), and Parker Solar Probe.
 
 ## 💾 Installation
 
@@ -152,3 +153,7 @@ If you use _PyThea_ for scientific work or research presented in a publication,
 ## ⓘ The mythology of Thea:
 
 In Greek mythology, Thea, also called Euryphaessa "wide-shining", is the Titaness of sight and the shining light of the clear blue sky. Her brother/consort is Hyperion, a Titan and god of the sun, and together they are the parents of Helios (the Sun), Selene (the Moon), and Eos (the Dawn).
+
+## Development Support:
+
+The lead author of this software package Athanasios Kouloumvakos acknowledges financial support from NASA Grant 80NSSC24K0071   for the further development and improvement of PyThea during 2024. This grant was part of the NASA Headquarters Heliophysics Tools and Methods Program in response to NASA ROSES–2022 (NNH22ZDA001N).

{pythea-0.13.0 → pythea-1.0.0}/PyThea.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ PyThea/geometrical_models.py
 PyThea/modules.py
 PyThea/pythea_cli.py
 PyThea/utils.py
+PyThea/utils_database.py
 PyThea/version.py
 PyThea.egg-info/.DS_Store
 PyThea.egg-info/PKG-INFO

{pythea-0.13.0 → pythea-1.0.0}/PyThea.egg-info/requires.txt

@@ -7,6 +7,7 @@ astroquery
 jplephem
 numexpr
 sunpy==5.1.2
+sunpy_soar
 parfive==2.1.0
 pooch
 matplotlib

{pythea-0.13.0 → pythea-1.0.0}/README.md

@@ -10,10 +10,7 @@
 
 ![Logo](https://github.com/AthKouloumvakos/PyThea/blob/master/docs/logo/pythea_logo.png)
 
-_PyThea_ is an open-source software package that can be used to reconstruct the 3D structure of Coronal Mass Ejections (CMEs) and shock waves and determine their kinematics using remote-sensing observations. The tool implements the Graduated Cylindrical Shell (GCS) model that can be used to reconstruct CMEs and two geometrical models, namely a spheroid and ellipsoid model to reconstruct shock waves. It also implements remote-sensing observations from multiple viewpoints such as the Solar and Heliospheric Observatory (SoHO) and Solar Terrestrial Relations Observatory (STEREO).
-
-> [!NOTE]
-> The lead author of PyThea (A. Kouloumvakos) has been awarded a NASA Grant (80NSSC24K0071) for further developing and improving PyThea, during fiscal year 2024. The awarded proposal is part of the NASA Headquarters Heliophysics Tools and Methods Program in response to NASA ROSES–2022 (NNH22ZDA001N). The proposed software enhancements and new features encompass a range of improvements, including but not limited to: improved code documentation, expanded and improved code testing, improved image processing and visualization, and the incorporation of new solar mission imaging data.
+_PyThea_ is an open-source software package that can be used to reconstruct the 3D structure of Coronal Mass Ejections (CMEs) and shock waves and determine their kinematics using remote-sensing observations. The tool implements the Graduated Cylindrical Shell (GCS) model that can be used to reconstruct CMEs and two geometrical models, namely a spheroid and ellipsoid model to reconstruct shock waves. It also implements remote-sensing observations from multiple viewpoints such as the Solar and Heliospheric Observatory (SoHO), Solar Terrestrial Relations Observatory (STEREO), and Parker Solar Probe.
 
 ## 💾 Installation
 
@@ -112,3 +109,7 @@ If you use _PyThea_ for scientific work or research presented in a publication,
 ## ⓘ The mythology of Thea:
 
 In Greek mythology, Thea, also called Euryphaessa "wide-shining", is the Titaness of sight and the shining light of the clear blue sky. Her brother/consort is Hyperion, a Titan and god of the sun, and together they are the parents of Helios (the Sun), Selene (the Moon), and Eos (the Dawn).
+
+## Development Support:
+
+The lead author of this software package Athanasios Kouloumvakos acknowledges financial support from NASA Grant 80NSSC24K0071   for the further development and improvement of PyThea during 2024. This grant was part of the NASA Headquarters Heliophysics Tools and Methods Program in response to NASA ROSES–2022 (NNH22ZDA001N).

{pythea-0.13.0 → pythea-1.0.0}/README_pypi.md

@@ -7,7 +7,7 @@
 ![flake8](https://github.com/AthKouloumvakos/PyThea/actions/workflows/flake8.yml/badge.svg)
 ![pytest](https://github.com/AthKouloumvakos/PyThea/actions/workflows/pytest.yml/badge.svg)
 
-_PyThea_ is an open-source software package that can be used to reconstruct the 3D structure of Coronal Mass Ejections (CMEs) and shock waves and determine their kinematics using remote-sensing observations. The tool implements the Graduated Cylindrical Shell (GCS) model that can be used to reconstruct CMEs and two geometrical models, namely a spheroid and ellipsoid model to reconstruct shock waves. It also implements remote-sensing observations from multiple viewpoints such as the Solar and Heliospheric Observatory (SoHO) and Solar Terrestrial Relations Observatory (STEREO).
+_PyThea_ is an open-source software package that can be used to reconstruct the 3D structure of Coronal Mass Ejections (CMEs) and shock waves and determine their kinematics using remote-sensing observations. The tool implements the Graduated Cylindrical Shell (GCS) model that can be used to reconstruct CMEs and two geometrical models, namely a spheroid and ellipsoid model to reconstruct shock waves. It also implements remote-sensing observations from multiple viewpoints such as the Solar and Heliospheric Observatory (SoHO), Solar Terrestrial Relations Observatory (STEREO), and Parker Solar Probe.
 
 ## 💾 Installation
 
@@ -106,3 +106,7 @@ If you use _PyThea_ for scientific work or research presented in a publication,
 ## ⓘ The mythology of Thea:
 
 In Greek mythology, Thea, also called Euryphaessa "wide-shining", is the Titaness of sight and the shining light of the clear blue sky. Her brother/consort is Hyperion, a Titan and god of the sun, and together they are the parents of Helios (the Sun), Selene (the Moon), and Eos (the Dawn).
+
+## Development Support:
+
+The lead author of this software package Athanasios Kouloumvakos acknowledges financial support from NASA Grant 80NSSC24K0071   for the further development and improvement of PyThea during 2024. This grant was part of the NASA Headquarters Heliophysics Tools and Methods Program in response to NASA ROSES–2022 (NNH22ZDA001N).

{pythea-0.13.0 → pythea-1.0.0}/environment.yml

@@ -27,3 +27,4 @@ dependencies:
   - pip:
       - pooch
       - jplephem
+      - sunpy_soar

{pythea-0.13.0 → pythea-1.0.0}/requirements.txt

@@ -7,6 +7,7 @@ astroquery
 jplephem
 numexpr
 sunpy==5.1.2
+sunpy_soar
 parfive==2.1.0
 pooch
 matplotlib

{pythea-0.13.0 → pythea-1.0.0}/setup.py

@@ -11,6 +11,7 @@ from setuptools import find_packages, setup
 if not os.path.isdir(os.path.join(Path.home(), 'PyThea')):
     os.mkdir(os.path.join(Path.home(), 'PyThea'))
     os.mkdir(os.path.join(Path.home(), 'PyThea', 'data'))
+    os.mkdir(os.path.join(Path.home(), 'PyThea', 'data_manager'))
 
 with open('README_pypi.md', 'r', encoding='utf8') as f:
     long_description = f.read()