PyThea 0.14.0__tar.gz → 1.1.0__tar.gz

{pythea-0.14.0 → pythea-1.1.0}/CHANGELOG.md

@@ -1,3 +1,31 @@
+# v1.1.0 (12-Feb-2025)
+
+## Minor Changes
+ - Updates the dependencies for sunpy>6.0
+ - Improves the utility of HEK events retrieval
+
+ ## Bug Fixes
+ - Fixes a flakes8 error for using bare except
+ - Fixes get_horizons_coord passing id_type
+ - Fixes a bug when no flare or AR data returned from HEK in the app
+ - Removes AIA fix_observer_location as it is no longer needed
+
+# 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

{pythea-0.14.0 → pythea-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: PyThea
-Version: 0.14.0
+Version: 1.1.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
@@ -10,25 +10,25 @@ Keywords: science,solar physics,solar,sun,shock waves
 Platform: any
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: Physics
-Requires-Python: >=3.8, <3.11
+Requires-Python: >=3.10, <3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: numpy==1.26.4
+Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: scipy
 Requires-Dist: aiapy
-Requires-Dist: astropy==6.0.0
+Requires-Dist: astropy
 Requires-Dist: astroquery
 Requires-Dist: jplephem
 Requires-Dist: numexpr
-Requires-Dist: sunpy==5.1.2
+Requires-Dist: sunpy==6.0.4
 Requires-Dist: sunpy_soar
 Requires-Dist: parfive==2.1.0
 Requires-Dist: pooch
@@ -44,6 +44,17 @@ Requires-Dist: pyvista
 Requires-Dist: pytest-astropy
 Requires-Dist: pytest-sugar
 Requires-Dist: pytest-mpl
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # PyThea: A software package to reconstruct the 3D structure of CMEs and shock waves
 
@@ -54,7 +65,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
 
@@ -153,3 +164,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.14.0 → pythea-1.1.0}/PyThea/PyThea_app.py

@@ -85,7 +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 and METIS 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.**

{pythea-0.14.0 → pythea-1.1.0}/PyThea/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.14.0'
-__version_tuple__ = version_tuple = (0, 14, 0)
+__version__ = version = '1.1.0'
+__version_tuple__ = version_tuple = (1, 1, 0)

{pythea-0.14.0 → pythea-1.1.0}/PyThea/config/selected_imagers.py

@@ -80,3 +80,10 @@ imager_dict['EUI-FSI'] = {'fido': (a.Instrument('EUI'), a.soar.Product('EUI-FSI1
 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.14.0 → pythea-1.1.0}/PyThea/extensions/Parker_spirals/utils.py

@@ -25,7 +25,7 @@ def plot_parker_spiral(axis, map, bodies, sw_speed=350 * (u.km / u.second)):
     None
     """
     for body in bodies:
-        pos = get_horizons_coord(bodies_dict[body][0], map.date_average, 'id')
+        pos = get_horizons_coord(bodies_dict[body][0], map.date_average)
         pos = pos.transform_to(frames.HeliographicCarrington(observer='Earth', obstime=map.date_average))
 
         spiral_coord = Parker_spirals.spiral(pos, sw_speed[body], map.date_average)

{pythea-0.14.0 → pythea-1.1.0}/PyThea/extensions/hek/utils.py

@@ -8,8 +8,67 @@ from sunpy.net import hek
 from sunpy.physics.differential_rotation import solar_rotate_coordinate
 from sunpy.time import parse_time
 
+hek_client = hek.HEKClient()
 
-def plot_hek(axis, map, mode, time_range=[-2, 2], hek_responses=None):
+
+def get_hek_active_regions(date, time_range):
+    start_time = date + TimeDelta(time_range[0] * u.hour)
+    end_time = date + TimeDelta(time_range[1] * u.hour)
+
+    responses = hek_client.search(a.Time(start_time, end_time),
+                                  a.hek.AR, a.hek.FRM.Name == 'HMI SHARP')
+
+    if str(responses) == '<No columns>':
+        return []
+
+    responses.keep_columns(['ar_noaanum', 'ar_mcintoshcls', 'ar_mtwilsoncls', 'hgs_x', 'hgs_y', 'event_starttime'])
+    indx = [i for i, x in enumerate(responses['ar_noaanum']) if x is None]
+    responses.remove_rows(indx)
+    responses = responses[['ar_noaanum', 'ar_mcintoshcls', 'ar_mtwilsoncls', 'hgs_x', 'hgs_y', 'event_starttime']]
+    dates = Time(responses['event_starttime'])
+    time_diff = np.abs(dates - date)
+    time_diff_seconds = np.array([td.sec for td in time_diff])
+    if len(np.unique(time_diff_seconds)) > 1:
+        responses.remove_rows(np.where(time_diff_seconds == np.max(time_diff_seconds)))
+
+    responses_ = hek_client.search(a.Time(start_time, end_time),
+                                   a.hek.AR, a.hek.FRM.Name == 'NOAA SWPC Observer')
+    responses_.keep_columns(['ar_noaanum', 'ar_mcintoshcls', 'ar_mtwilsoncls', 'hgs_x', 'hgs_y'])
+
+    responses['ar_mcintoshcls'] = np.full(responses['ar_noaanum'].shape[0], None)
+    responses['ar_mtwilsoncls'] = np.full(responses['ar_noaanum'].shape[0], None)
+
+    for rn, clm, clw in zip(responses_['ar_noaanum'], responses_['ar_mcintoshcls'], responses_['ar_mtwilsoncls']):
+        i = np.argwhere(responses['ar_noaanum'] == rn)
+        responses['ar_mcintoshcls'][i] = clm
+        responses['ar_mtwilsoncls'][i] = clw
+
+    return responses
+
+
+def get_hek_coronal_holes(start_time, end_time):
+
+    responses = hek_client.search(a.Time(start_time, end_time),
+                                  a.hek.CH, a.hek.FRM.Name == 'SPoCA')
+    return responses
+
+
+def get_hek_flares(start_time, end_time):
+    # TODO: Merge this with get_hek_flare from PyThea utils.
+    responses = hek_client.search(a.Time(start_time, end_time),
+                                  a.hek.FL, a.hek.FRM.Name == 'SWPC')
+
+    if str(responses) == '<No columns>':
+        return []
+
+    responses.keep_columns(['event_starttime', 'event_peaktime', 'fl_goescls', 'hgs_x', 'hgs_y', 'ar_noaanum'])
+    responses.remove_rows(np.where((responses['hgs_x'] == 0) & (responses['hgs_y'] == 0)))
+    responses = responses[['event_starttime', 'event_peaktime', 'fl_goescls', 'hgs_x', 'hgs_y', 'ar_noaanum']]
+
+    return responses
+
+
+def plot_hek(axis, date, mode, time_range=[-2, 2], hek_responses=None):
     """
     Plots HEK (Heliophysics Event Knowledgebase) events on a given axis.
 
@@ -34,37 +93,13 @@ def plot_hek(axis, map, mode, time_range=[-2, 2], hek_responses=None):
     responses: list
         The list of HEK event responses.
     """
-    hek_client = hek.HEKClient()
-    start_time = map.date_average + TimeDelta(time_range[0] * u.hour)
-    end_time = map.date_average + TimeDelta(time_range[1] * u.hour)
+
+    start_time = date + TimeDelta(time_range[0] * u.hour)
+    end_time = date + TimeDelta(time_range[1] * u.hour)
 
     if mode == 'Active Regions':
         if hek_responses is None or not hek_responses['Active Regions']:
-            responses = hek_client.search(a.Time(start_time, end_time),
-                                          a.hek.AR, a.hek.FRM.Name == 'HMI SHARP')
-
-            responses.keep_columns(['ar_noaanum', 'ar_mcintoshcls', 'ar_mtwilsoncls', 'hgs_x', 'hgs_y', 'event_starttime'])
-            indx = [i for i, x in enumerate(responses['ar_noaanum']) if x is None]
-            responses.remove_rows(indx)
-            responses = responses[['ar_noaanum', 'ar_mcintoshcls', 'ar_mtwilsoncls', 'hgs_x', 'hgs_y', 'event_starttime']]
-            dates = Time(responses['event_starttime'])
-            time_diff = np.abs(dates - map.date_average)
-            time_diff_seconds = np.array([td.sec for td in time_diff])
-            if len(np.unique(time_diff_seconds)) > 1:
-                responses.remove_rows(np.where(time_diff_seconds == np.max(time_diff_seconds)))
-
-            responses_ = hek_client.search(a.Time(start_time, end_time),
-                                           a.hek.AR, a.hek.FRM.Name == 'NOAA SWPC Observer')
-            responses_.keep_columns(['ar_noaanum', 'ar_mcintoshcls', 'ar_mtwilsoncls', 'hgs_x', 'hgs_y'])
-
-            responses['ar_mcintoshcls'] = np.full(responses['ar_noaanum'].shape[0], None)
-            responses['ar_mtwilsoncls'] = np.full(responses['ar_noaanum'].shape[0], None)
-
-            for rn, clm, clw in zip(responses_['ar_noaanum'], responses_['ar_mcintoshcls'], responses_['ar_mtwilsoncls']):
-                i = np.argwhere(responses['ar_noaanum'] == rn)
-                responses['ar_mcintoshcls'][i] = clm
-                responses['ar_mtwilsoncls'][i] = clw
-            print(responses)
+            responses = get_hek_active_regions(date, time_range)
         else:
             responses = hek_responses['Active Regions']
 
@@ -78,8 +113,7 @@ def plot_hek(axis, map, mode, time_range=[-2, 2], hek_responses=None):
                           horizontalalignment='center', verticalalignment='center')
     elif mode == 'Coronal Holes':
         if hek_responses is None or not hek_responses['Coronal Holes']:
-            responses = hek_client.search(a.Time(start_time, end_time),
-                                          a.hek.CH, a.hek.FRM.Name == 'SPoCA')
+            responses = get_hek_coronal_holes(start_time, end_time)
         else:
             responses = hek_responses['Coronal Holes']
 
@@ -92,15 +126,11 @@ def plot_hek(axis, map, mode, time_range=[-2, 2], hek_responses=None):
                 [(float(v[0]), float(v[1])) * u.arcsec for v in p3],
                 obstime=ch_date, observer='earth',
                 frame=frames.Helioprojective)
-            rotated_ch_boundary = solar_rotate_coordinate(ch_boundary, time=map.date_average)
+            rotated_ch_boundary = solar_rotate_coordinate(ch_boundary, time=date)
             axis.plot_coord(rotated_ch_boundary, color='c')
     elif mode == 'Flares':
         if hek_responses is None or not hek_responses['Flares']:
-            responses = hek_client.search(a.Time(start_time, end_time),
-                                          a.hek.FL, a.hek.FRM.Name == 'SWPC')
-            responses.keep_columns(['event_starttime', 'event_peaktime', 'fl_goescls', 'hgs_x', 'hgs_y', 'ar_noaanum'])
-            responses.remove_rows(np.where((responses['hgs_x'] == 0) & (responses['hgs_y'] == 0)))
-            responses = responses[['event_starttime', 'event_peaktime', 'fl_goescls', 'hgs_x', 'hgs_y', 'ar_noaanum']]
+            responses = get_hek_flares(start_time, end_time)
         else:
             responses = hek_responses['Flares']
 

{pythea-0.14.0 → pythea-1.1.0}/PyThea/modules.py

@@ -352,7 +352,7 @@ def figure_streamlit(st, running_map, image_mode, imager, model):
         if 'hek_responses' not in st.session_state:
             st.session_state.hek_responses = {'Active Regions': [], 'Coronal Holes': [], 'Flares': []}
         for mode in st.session_state.hek_list:
-            st.session_state.hek_responses[mode] = plot_hek(axis, running_map, mode,
+            st.session_state.hek_responses[mode] = plot_hek(axis, running_map.date_average, mode,
                                                             st.session_state.imaging_time_range,
                                                             hek_responses=st.session_state.hek_responses)
 

pythea-1.1.0/PyThea/sunpy_dev/extern/sunkit_instruments/aia/utils.py

@@ -0,0 +1,20 @@
+import warnings
+from astropy.time import TimeDelta
+from aiapy.calibrate import update_pointing
+
+__all__ = ['prep_aia']
+
+
+def prep_aia(map_sequence):
+    try:
+        map_sequence = [update_pointing(tmap) for tmap in map_sequence]
+    except Exception:
+        warnings.warn('Prepare AIA maps failed, script proceeded without update_pointing. Check connection with JSOC.', UserWarning)
+
+    # AIAMap already fixes the .observer_coordinate property with HAE, therefore, the following is removed.
+    # map_sequence = [fix_observer_location(tmap) for tmap in map_sequence]
+
+    for map_ in map_sequence:
+        map_.meta['DATE-AVG'] = (map_.date + TimeDelta(map_.meta['exptime']/2, format='sec')).value
+
+    return map_sequence

{pythea-0.14.0 → pythea-1.1.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,11 +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.]
-    if images[1].instrument == 'Metis':
+    elif images[i].instrument == 'Metis':
         return [12.80, 13.00]
-    return [np.nanquantile(images[1].data, 0.20)-10, np.nanquantile(images[1].data, 0.80)+10]
+    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.14.0 → pythea-1.1.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.14.0 → pythea-1.1.0}/PyThea/test/test_extension_utils.py

@@ -19,7 +19,7 @@ def test_parker_spiral():
     time = '2022-01-01T00:00:00'
     body = bodies_dict['Earth'][0]
 
-    pos = get_horizons_coord(body, time, 'id')
+    pos = get_horizons_coord(body, time)
     pos = pos.transform_to(frames.HeliographicCarrington(observer='Earth', obstime=time))
 
     spiral_coord = Parker_spirals.spiral(pos, 350 * (u.km/u.second), time)
@@ -43,7 +43,7 @@ def test_footpoint():
     time = '2022-01-01T00:00:00'
     body = bodies_dict['Earth'][0]
 
-    pos = get_horizons_coord(body, time, 'id')
+    pos = get_horizons_coord(body, time)
     pos = pos.transform_to(frames.HeliographicCarrington(observer='Earth', obstime=time))
 
     footpoint_coord = Parker_spirals.footpoint(pos, 350 * (u.km/u.second), time)

{pythea-0.14.0 → pythea-1.1.0}/PyThea/utils.py

@@ -128,10 +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':
-        clim = [-10**-clim[0], 10**-clim[1]]
-
-    if map.instrument == 'Metis':
+    if map.instrument in ['WISPR', 'Metis'] or map.instrument.startswith('SoloHI'):
         clim = [-10**-clim[0], 10**-clim[1]]
 
     if cmap == 'default':
@@ -155,9 +152,19 @@ 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.replace('VLD', 'METIS-VDL')),
+    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

{pythea-0.14.0 → pythea-1.1.0}/PyThea/utils_database.py

@@ -79,7 +79,8 @@ def get_fits_filenames_from_database(event_id, timerange, imager):
 
     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_}
 

{pythea-0.14.0 → pythea-1.1.0}/PyThea.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: PyThea
-Version: 0.14.0
+Version: 1.1.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
@@ -10,25 +10,25 @@ Keywords: science,solar physics,solar,sun,shock waves
 Platform: any
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: Physics
-Requires-Python: >=3.8, <3.11
+Requires-Python: >=3.10, <3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: numpy==1.26.4
+Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: scipy
 Requires-Dist: aiapy
-Requires-Dist: astropy==6.0.0
+Requires-Dist: astropy
 Requires-Dist: astroquery
 Requires-Dist: jplephem
 Requires-Dist: numexpr
-Requires-Dist: sunpy==5.1.2
+Requires-Dist: sunpy==6.0.4
 Requires-Dist: sunpy_soar
 Requires-Dist: parfive==2.1.0
 Requires-Dist: pooch
@@ -44,6 +44,17 @@ Requires-Dist: pyvista
 Requires-Dist: pytest-astropy
 Requires-Dist: pytest-sugar
 Requires-Dist: pytest-mpl
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # PyThea: A software package to reconstruct the 3D structure of CMEs and shock waves
 
@@ -54,7 +65,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
 
@@ -153,3 +164,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.14.0 → pythea-1.1.0}/PyThea.egg-info/requires.txt

@@ -1,12 +1,12 @@
-numpy==1.26.4
+numpy
 pandas
 scipy
 aiapy
-astropy==6.0.0
+astropy
 astroquery
 jplephem
 numexpr
-sunpy==5.1.2
+sunpy==6.0.4
 sunpy_soar
 parfive==2.1.0
 pooch

{pythea-0.14.0 → pythea-1.1.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.14.0 → pythea-1.1.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.14.0 → pythea-1.1.0}/environment.yml

@@ -5,16 +5,16 @@ channels:
   - defaults
 
 dependencies:
-  - python=3.9
-  - numpy=1.26.4
+  - python=3.10
+  - numpy
   - pandas
   - scipy
   - matplotlib
   - aiapy
-  - astropy=6.0.0
+  - astropy
   - astroquery
   - numexpr
-  - sunpy=5.1.2
+  - sunpy=6.0.4
   - parfive=2.1.0  # The issue with streamlit and asyncio is resolved (see #13). Keep this for a while to make sure everything works smoothly.
   - streamlit
   - seaborn

{pythea-0.14.0 → pythea-1.1.0}/requirements.txt

@@ -1,12 +1,12 @@
-numpy==1.26.4
+numpy
 pandas
 scipy
 aiapy
-astropy==6.0.0
+astropy
 astroquery
 jplephem
 numexpr
-sunpy==5.1.2
+sunpy==6.0.4
 sunpy_soar
 parfive==2.1.0
 pooch

{pythea-0.14.0 → pythea-1.1.0}/setup.cfg

@@ -9,9 +9,8 @@ classifiers =
 	Operating System :: OS Independent
 	Programming Language :: Python
 	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.8
-	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
+	Programming Language :: Python :: 3.11
 	Topic :: Scientific/Engineering :: Physics
 
 [options]

{pythea-0.14.0 → pythea-1.1.0}/setup.py

@@ -37,8 +37,8 @@ setup(
     classifiers=[
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Development Status :: 4 - Beta',
         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
         'Operating System :: OS Independent',
@@ -46,7 +46,7 @@ setup(
         'Topic :: Scientific/Engineering :: Physics',
     ],
 
-    python_requires='>=3.8, <3.11',
+    python_requires='>=3.10, <3.12',
     install_requires=requirements,
 
     packages=find_packages(),

pythea-0.14.0/PyThea/sunpy_dev/extern/sunkit_instruments/aia/utils.py

@@ -1,14 +0,0 @@
-from astropy.time import TimeDelta
-from aiapy.calibrate import fix_observer_location, update_pointing
-
-__all__ = ['prep_aia']
-
-
-def prep_aia(map_sequence):
-    map_sequence = [update_pointing(tmap) for tmap in map_sequence]
-    map_sequence = [fix_observer_location(tmap) for tmap in map_sequence]
-
-    for map_ in map_sequence:
-        map_.meta['DATE-AVG'] = (map_.date + TimeDelta(map_.meta['exptime']/2, format='sec')).value
-
-    return map_sequence