seppy 0.1.16__py3-none-any.whl → 0.1.18__py3-none-any.whl

seppy/loader/psp.py

@@ -410,8 +410,8 @@ def calc_av_en_flux_PSP_EPIHI(df, energies, en_channel, species, instrument, vie
             flux_key = 'H_Flux'
     en_str = energies[f'{species_str}_ENERGY_LABL']
     if type(en_channel) == list:
-        energy_low = en_str[en_channel[0]][0].split('-')[0]
-        energy_up = en_str[en_channel[-1]][0].split('-')[-1]
+        energy_low = en_str[en_channel[0]].flat[0].split('-')[0]
+        energy_up = en_str[en_channel[-1]].flat[0].split('-')[-1]
         en_channel_string = energy_low + '-' + energy_up
 
         DE = energies[f'{species_str}_ENERGY_DELTAPLUS']+energies[f'{species_str}_ENERGY_DELTAMINUS']

seppy/loader/soho.py

@@ -39,13 +39,13 @@ def _get_metadata(dataset, path_to_cdf):
         if dataset=='SOHO_ERNE-LED_L2-1MIN':
             alpha = 'A'
             m = 'L'
-        metadata = {'He_E_label': cdf.varget('He_E_label')[0],
+        metadata = {'He_E_label': cdf.varget('He_E_label').flatten(),
                     'He_energy': cdf.varget('He_energy'),
                     'He_energy_delta': cdf.varget('He_energy_delta'),
                     f'{alpha}{m}_LABL': cdf.varattsget(f'{alpha}{m}')['LABLAXIS'],
                     f'{alpha}{m}_UNITS': cdf.varattsget(f'{alpha}{m}')['UNITS'],
                     f'{alpha}{m}_FILLVAL': cdf.varattsget(f'{alpha}{m}')['FILLVAL'],
-                    'P_E_label': cdf.varget('P_E_label')[0],
+                    'P_E_label': cdf.varget('P_E_label').flatten(),
                     'P_energy': cdf.varget('P_energy'),
                     'P_energy_delta': cdf.varget('P_energy_delta'),
                     f'P{m}_LABL': cdf.varattsget(f'P{m}')['LABLAXIS'],
@@ -53,14 +53,14 @@ def _get_metadata(dataset, path_to_cdf):
                     f'P{m}_FILLVAL': cdf.varattsget(f'P{m}')['FILLVAL'],
                     }
 
-        channels_dict_df_He = pd.DataFrame(cdf.varget('He_E_label')[0], columns=['ch_strings'])
+        channels_dict_df_He = pd.DataFrame(cdf.varget('He_E_label').flatten(), columns=['ch_strings'])
         channels_dict_df_He['lower_E'] = cdf.varget("He_energy")-cdf.varget("He_energy_delta")
         channels_dict_df_He['upper_E'] = cdf.varget("He_energy")+cdf.varget("He_energy_delta")
         channels_dict_df_He['DE'] = cdf.varget("He_energy_delta")
         # channels_dict_df_He['mean_E'] = np.sqrt(channels_dict_df_He['upper_E'] * channels_dict_df_He['lower_E'])
         channels_dict_df_He['mean_E'] = cdf.varget("He_energy")
 
-        channels_dict_df_p = pd.DataFrame(cdf.varget('P_E_label')[0], columns=['ch_strings'])
+        channels_dict_df_p = pd.DataFrame(cdf.varget('P_E_label').flatten(), columns=['ch_strings'])
         channels_dict_df_p['lower_E'] = cdf.varget("P_energy")-cdf.varget("P_energy_delta")
         channels_dict_df_p['upper_E'] = cdf.varget("P_energy")+cdf.varget("P_energy_delta")
         channels_dict_df_p['DE'] = cdf.varget("P_energy_delta")

seppy/loader/wind.py

@@ -180,6 +180,9 @@ def wind3dp_download(dataset, startdate, enddate, path=None, **kwargs):
             if not os.path.exists(f):
                 # downloaded_file = Fido.fetch(result[0][i], path=path, max_conn=max_conn)
                 downloaded_file = wind3dp_single_download(files[i], path=path)
+                if downloaded_file == []:
+                    print('Trying download from CDAWeb...')
+                    downloaded_file = Fido.fetch(result[0][i], path=path)  #, max_conn=max_conn)
 
     except (RuntimeError, IndexError):
         print(f'Unable to obtain "{dataset}" data for {startdate}-{enddate}!')
@@ -279,22 +282,31 @@ def wind3dp_load(dataset, startdate, enddate, resample="1min", multi_index=True,
         metacdf = cdflib.CDF(path_to_metafile)
 
         e_mean = df.filter(like='ENERGY_').mean()
-        # ∼30% ΔE/E => ΔE = 0.3*E
         # from Table 3 of Wilson et al. 2021, https://doi.org/10.1029/2020RG000714
-        delta_e = 0.3 * e_mean
+        # ∼30% ΔE/E => ΔE = 0.3*E
+        if dataset in ['WI_SFSP_3DP', 'WI_SFPD_3DP', 'WI_SOSP_3DP', 'WI_SOPD_3DP']:
+            delta_e = 0.3 * e_mean
+        # ∼20% ΔE/E => ΔE = 0.2*E
+        elif dataset in ['WI_ELSP_3DP', 'WI_ELPD_3DP', 'WI_EHSP_3DP', 'WI_EHPD_3DP']:
+            delta_e = 0.2 * e_mean
         e_low = e_mean - delta_e
         e_high = e_mean + delta_e
         energies = pd.concat([e_mean, delta_e, e_low, e_high], axis=1, keys=['mean_E', 'DE', 'lower_E', 'upper_E'])
         energies['Bins_Text']= np.around(e_low/1e3, 2).astype('string') +' - '+ np.around(e_high/1e3, 2).astype('string') + ' keV'
 
         meta = {'channels_dict_df': energies,
-                'APPROX_ENERGY_LABELS': metacdf.varget('APPROX_ENERGY_LABELS'),
                 'ENERGY_UNITS': metacdf.varattsget('ENERGY')['UNITS'],
                 'FLUX_UNITS': metacdf.varattsget('FLUX')['UNITS'],
                 'FLUX_FILLVAL': metacdf.varattsget('FLUX')['FILLVAL'],
-                'FLUX_LABELS': metacdf.varget('FLUX_ENERGY_LABL'),
                 }
 
+        # for SFSP, SOSP, SFPD, SFSP:
+        try:
+            meta['APPROX_ENERGY_LABELS'] = metacdf.varget('APPROX_ENERGY_LABELS')
+            meta['FLUX_LABELS'] = metacdf.varget('FLUX_ENERGY_LABL')
+        except:
+            pass
+
         # create multi-index data frame of flux
         if multi_index:
             if dataset == 'WI_SFPD_3DP' or dataset == 'WI_SOPD_3DP':

seppy/tests/test_loader.py

@@ -14,7 +14,7 @@ def test_psp_load_online():
                               enddate="2021/06/01", path=None, resample="1min")
     assert isinstance(df, pd.DataFrame)
     assert df.shape == (48, 136)
-    assert meta['H_ENERGY_LABL'][0][0] == '  6.7 -   8.0 MeV'
+    assert meta['H_ENERGY_LABL'].flatten()[0] == '  6.7 -   8.0 MeV'
     # Check that fillvals are replaced by NaN
     assert np.sum(np.isnan(df['B_H_Uncertainty_14'])) == 48
     #
@@ -71,6 +71,15 @@ def test_soho_ephin_load_offline():
     assert np.sum(np.isnan(df['E1300'])) == 444
 
 
+def test_soho_erne_load_online():
+    df, meta = soho_load(dataset='SOHO_ERNE-HED_L2-1MIN', startdate="2021/04/16", enddate="2021/04/17",
+                         path=None, resample="1min", pos_timestamp='center')
+    assert isinstance(df, pd.DataFrame)
+    assert df.shape == (1145, 41)
+    assert meta['channels_dict_df_p']['ch_strings'].iloc[9] == '100 - 130 MeV'
+    assert df['PHC_9'].sum() == 1295.0
+
+
 def test_solo_mag_load_online():
     df = mag_load("2021/07/12", "2021/07/13", level='l2', data_type='normal-1-minute', frame='rtn', path=None)
     assert isinstance(df, pd.DataFrame)
@@ -93,7 +102,7 @@ def test_stereo_het_load_online():
                            path=None, resample="1min", pos_timestamp='center')
     assert isinstance(df, pd.DataFrame)
     assert df.shape == (1440, 28)
-    assert meta['Proton_Bins_Text'][0][0] == '13.6 - 15.1 MeV '
+    assert meta['Proton_Bins_Text'].flatten()[0] == '13.6 - 15.1 MeV '
     assert np.sum(np.isnan(df['Electron_Flux_0'])) == 0
 
 
@@ -105,7 +114,7 @@ def test_stereo_het_load_offline():
                            path=path, resample="1min", pos_timestamp=None)
     assert isinstance(df, pd.DataFrame)
     assert df.shape == (1440, 28)
-    assert meta['Proton_Bins_Text'][0][0] == '13.6 - 15.1 MeV '
+    assert meta['Proton_Bins_Text'].flatten()[0] == '13.6 - 15.1 MeV '
     assert np.sum(np.isnan(df['Electron_Flux_0'])) == 0
 
 
@@ -141,7 +150,7 @@ def test_wind3dp_load_online():
                             path=None)
     assert isinstance(df, pd.DataFrame)
     assert df.shape == (2880, 76)
-    assert meta['FLUX_LABELS'][0][0] == 'ElecNoFlux_Ch1_Often~27keV '
+    assert meta['FLUX_LABELS'].flatten()[0] == 'ElecNoFlux_Ch1_Often~27keV '
     # Check that fillvals are replaced by NaN
     assert np.sum(np.isnan(df['FLUX_E0', 'FLUX_E0_P0'])) == 169
 
@@ -158,6 +167,6 @@ def test_wind3dp_load_offline():
                             path=path)
     assert isinstance(df, pd.DataFrame)
     assert df.shape == (897, 15)
-    assert meta['FLUX_LABELS'][0][0] == 'ElecNoFlux_Ch1_Often~27keV '
+    assert meta['FLUX_LABELS'].flatten()[0] == 'ElecNoFlux_Ch1_Often~27keV '
     # Check that fillvals are replaced by NaN
     assert np.sum(np.isnan(df['FLUX_0'])) == 352

seppy/tools/__init__.py

@@ -675,9 +675,9 @@ class Event:
 
             # An IndexError here is caused by invalid channel choice
             try:
-                en_channel_string = en_str[en_channel[0]][0].split()[0] + ' - '\
-                    + en_str[en_channel[-1]][0].split()[2] + ' ' +\
-                    en_str[en_channel[-1]][0].split()[3]
+                en_channel_string = en_str[en_channel[0]].flat[0].split()[0] + ' - '\
+                    + en_str[en_channel[-1]].flat[0].split()[2] + ' ' +\
+                    en_str[en_channel[-1]].flat[0].split()[3]
 
             except IndexError:
                 raise Exception(f"{en_channel} is an invalid channel or a combination of channels!")
@@ -781,9 +781,9 @@ class Event:
 
             # An IndexError here is caused by invalid channel choice
             try:
-                en_channel_string = en_str[en_channel[0]][0].split()[0] + ' - '\
-                    + en_str[en_channel[-1]][0].split()[2] + ' '\
-                    + en_str[en_channel[-1]][0].split()[3]
+                en_channel_string = en_str[en_channel[0]].flat[0].split()[0] + ' - '\
+                    + en_str[en_channel[-1]].flat[0].split()[2] + ' '\
+                    + en_str[en_channel[-1]].flat[0].split()[3]
 
             except IndexError:
                 raise Exception(f"{en_channel} is an invalid channel or a combination of channels!")
@@ -2276,8 +2276,8 @@ class Event:
                 p_identifier =  "Ion_Bins_Text" if self.sensor == "ept" else "H_Bins_Text" if self.sensor == "het" else "Bins_Text"
                 energy_ranges = energy_dict[p_identifier]
 
-            # Each element in the list is also a list with len==1, so fix that
-            energy_ranges = [element[0] for element in energy_ranges]
+            # Each element in the list is also a list with len==1 for cdflib < 1.3.3, so fix that
+            energy_ranges = energy_ranges.flatten()
 
         if self.spacecraft[:2] == "st":
 
@@ -2299,8 +2299,8 @@ class Event:
                 else:
                     energy_ranges = energy_dict["Proton_Bins_Text"]
 
-                # Each element in the list is also a list with len==1, so fix that
-                energy_ranges = [element[0] for element in energy_ranges]
+                # Each element in the list is also a list with len==1 for cdflib < 1.3.3, so fix that
+                energy_ranges = energy_ranges.flatten()
 
         if self.spacecraft == "soho":
             if self.sensor.lower() == "erne":
@@ -2322,9 +2322,8 @@ class Event:
                 if self.species == 'p':
                     energy_ranges = energy_dict["H_ENERGY_LABL"]
 
-                # In the case of ISOIS-EPIHI, each iterable object is a list with len=1 that contains
-                # the str
-                energy_ranges = [element[0] for element in energy_ranges]
+                # Each element in the list is also a list with len==1 for cdflib < 1.3.3, so fix that
+                energy_ranges = energy_ranges.flatten()
 
             if self.sensor == "isois-epilo":
                 # The metadata of ISOIS-EPILO comes in a bit of complex form, so some handling is required

seppy/version.py

@@ -5,4 +5,4 @@ try:
     from setuptools_scm import get_version
     __version__ = get_version(root='..', relative_to=__file__)
 except Exception:
-    __version__ = '0.1.16'
+    __version__ = '0.1.18'

{seppy-0.1.16.dist-info → seppy-0.1.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: seppy
-Version: 0.1.16
+Version: 0.1.18
 Summary: SEPpy
 Home-page: https://github.com/serpentine-h2020/SEPpy
 Author: Jan Gieseler
@@ -33,13 +33,13 @@ Requires-Dist: requests
 Requires-Dist: solo-epd-loader
 Requires-Dist: sunpy>=4.1.0
 Provides-Extra: all
-Provides-Extra: docs
-Requires-Dist: sphinx; extra == "docs"
-Requires-Dist: sphinx-automodapi; extra == "docs"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-doctestplus; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
+Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx-automodapi; extra == "docs"
 
 seppy
 =====
@@ -51,7 +51,7 @@ seppy
 .. |python version| image:: https://img.shields.io/pypi/pyversions/seppy?style=flat&logo=python
 .. |zenodo doi| image:: https://zenodo.org/badge/451799504.svg
    :target: https://zenodo.org/badge/latestdoi/451799504
-.. |pytest| image:: https://github.com/serpentine-h2020/SEPpy/workflows/pytest/badge.svg
+.. |pytest| image:: https://github.com/serpentine-h2020/SEPpy/actions/workflows/pytest.yml/badge.svg?branch=main
 .. |codecov| image:: https://codecov.io/gh/serpentine-h2020/SEPpy/branch/main/graph/badge.svg?token=FYELM4Y7DF 
    :target: https://codecov.io/gh/serpentine-h2020/SEPpy
 

{seppy-0.1.16.dist-info → seppy-0.1.18.dist-info}/RECORD

@@ -1,5 +1,5 @@
 seppy/__init__.py,sha256=M8ZBbGj0r_XdNVLzaSXF38M4wyzAgUX32LXcSYh5O5A,254
-seppy/version.py,sha256=vSeLQvdsXCv8Lj-8Fx74r8zYls2TOcJPROuO3_uzEmg,346
+seppy/version.py,sha256=iEN0RD6JC3vSYLuRt3T4F3yoAV8psN9gc6NwhYUisdU,346
 seppy/data/test/20230719_side0.csv,sha256=0htTQcdQydRc92bkO26lxK8tDRSeN6uov13VfsqmUFQ,72368
 seppy/data/test/20230719_side1.csv,sha256=iHCfHmOIltJatncWpns_zq3ym_-2yRu0twmDvQDbmJw,72368
 seppy/data/test/20230719_side2.csv,sha256=eYyEQX5fNDO4E57KwKN3bHs6u5-lHaAhIHt-3f20Urg,72368
@@ -10,20 +10,20 @@ seppy/data/test/solo_l2_mag-rtn-normal-1-minute_20210712_v01.cdf,sha256=Tc_-3YQM
 seppy/data/test/sta_l1_het_20211028_v01.cdf,sha256=429TIPXSQI5heQVNqyRYLF7HUDZPByzk-xYf9IzSJ0U,215082
 seppy/data/test/wi_sfsp_3dp_00000000_v01.cdf,sha256=ifAM0FiB2tepHmlpsqbotJMyQqSB3bwpPcKD6VhukFA,30939
 seppy/data/test/wi_sfsp_3dp_20200213_v01.cdf,sha256=UiKcBPcWZkh3KIBigoZubTJ3Fw90E8p7XhbA9uW6VWk,67008
-seppy/loader/psp.py,sha256=PbxCEW-06d2I_JGIfIAqqXMU_uPdQFhmh-fUoXpzz9k,31535
-seppy/loader/soho.py,sha256=EIFKde1dGpT9yU6bU-XtTsHUCvTEkzHhdPOOMtqVrDU,20262
+seppy/loader/psp.py,sha256=RDdagIW3ZnYAg3ra4wOKutxYuAJEI5S3UB7-v4e2rb0,31545
+seppy/loader/soho.py,sha256=e6SzUD_WxUiaAMlWQcTGVvdER4Wv9rI-PtCCEoUHVRw,20290
 seppy/loader/solo.py,sha256=Nst2ZJU2yH5NHsB6M_69ryVfzt978hbmqhxaHZJREVg,3054
 seppy/loader/stereo.py,sha256=S0_IRIFbFxLH00bSIt1uZMflmuG5dAU5sKw0w9NL9oM,24583
-seppy/loader/wind.py,sha256=3rWV_EOcY7sY69eqtCQCZxL5GxAQZuMm1-wpJJxrej8,18460
+seppy/loader/wind.py,sha256=44zqFJsNn2fyLDi5SLkqTQO5iGCdVk5a8p7s28VVw6Y,18995
 seppy/tests/__init__.py,sha256=1D-l3TVbwIZHY78A-sB7kc4ldldX8ZaEq-Ntph51WVw,108
-seppy/tests/test_loader.py,sha256=mt52vrAeSEtJ-od4Cqt0HrscN_ykKNHklGZm8OTZjLs,7767
+seppy/tests/test_loader.py,sha256=YAe0AnkmTQdVKvUvycClIrWrIVIRY_Ysu1AJTDyKR2U,8211
 seppy/tests/test_tools.py,sha256=LQPekw-ddse88OYu-LWChFcJPT2SwGS7uEG1tKRLVok,31539
-seppy/tools/__init__.py,sha256=Ge3lQ9zVRJ27aaHSet2I1wQ9tD4emVfjnn49pUGcoiY,116086
+seppy/tools/__init__.py,sha256=g8trTp5SOthizu8iUz7jew5xN6q4Qn_j2rHU3kvDm8k,116074
 seppy/tools/swaves.py,sha256=OcohPXLko0ik9FLyYMVkYxI75W4XzOKvQ2Ylnwi-wlQ,3139
 seppy/tools/widgets.py,sha256=atQj9vvus0UgrUV6vlPcTdjpaidnERUevOp6FUmGLSI,6820
 seppy/util/__init__.py,sha256=RMMeH37L75wwQPHb_-_-2Rk7lzlDtBC2K6lkWKtxAMg,15253
-seppy-0.1.16.dist-info/LICENSE.rst,sha256=SxptLPCIHKdfDjyguGdC7ai6Eze-Vz_t1jdqC8h19js,1473
-seppy-0.1.16.dist-info/METADATA,sha256=76lm6wNfS6rHjDAU6OYxgZQVfRvQbex2lrxpXtxwK3A,4374
-seppy-0.1.16.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-seppy-0.1.16.dist-info/top_level.txt,sha256=G2Op1GREPmbCX81isNhYY_7ZZyLWLIm-MJC04J4Fgc4,6
-seppy-0.1.16.dist-info/RECORD,,
+seppy-0.1.18.dist-info/LICENSE.rst,sha256=SxptLPCIHKdfDjyguGdC7ai6Eze-Vz_t1jdqC8h19js,1473
+seppy-0.1.18.dist-info/METADATA,sha256=PdfzrO7plNpS6UApUEeFtdM88Ut8GHN8J5CloJWrgGw,4398
+seppy-0.1.18.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+seppy-0.1.18.dist-info/top_level.txt,sha256=G2Op1GREPmbCX81isNhYY_7ZZyLWLIm-MJC04J4Fgc4,6
+seppy-0.1.18.dist-info/RECORD,,

{seppy-0.1.16.dist-info → seppy-0.1.18.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any