seppy 0.1.15__py3-none-any.whl → 0.1.17__py3-none-any.whl

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_tools.py

@@ -62,7 +62,7 @@ def test_onset_spectrum_tsa_SOLO_STEP_ions_new_data_online():
     assert flux.shape == (164,)
     assert len(onset_stats) == 6
     assert isinstance(onset_stats[5], pd._libs.tslibs.nattype.NaTType)  # onset_stats[5].isoformat().split('.')[0] == '2021-10-28T16:07:30'
-    assert ~onset_found
+    assert not onset_found
     assert peak_time.isoformat().split('.')[0] == '2022-01-09T01:32:31'
     assert fig.get_axes()[0].get_title() == 'SOLO/STEP 0.0061 - 0.0091 MeV protons\n5min averaging, viewing: PIXEL AVERAGED'
     # Pixel 8
@@ -71,7 +71,7 @@ def test_onset_spectrum_tsa_SOLO_STEP_ions_new_data_online():
     assert flux.shape == (164,)
     assert len(onset_stats) == 6
     assert isinstance(onset_stats[5], pd._libs.tslibs.nattype.NaTType)  # onset_stats[5].isoformat().split('.')[0] == '2021-10-28T16:12:30'
-    assert ~onset_found
+    assert not onset_found
     assert peak_time.isoformat().split('.')[0] == '2022-01-09T00:02:31'
     assert fig.get_axes()[0].get_title() == 'SOLO/STEP 0.0061 - 0.0091 MeV protons\n5min averaging, viewing: PIXEL 8'
 
@@ -101,7 +101,7 @@ def test_onset_spectrum_tsa_SOLO_HET_online():
     assert flux.shape == (73,)
     assert len(onset_stats) == 6
     assert isinstance(onset_stats[5], pd._libs.tslibs.nattype.NaTType)  # onset_stats[5] == pd.Timestamp('2021-10-28 15:31:59.492059')
-    assert ~onset_found
+    assert not onset_found
     assert peak_time.isoformat().split('.')[0] == '2022-11-08T17:58:09'
     assert fig.get_axes()[0].get_title() == 'SOLO/HET 7.3540 - 7.8900 MeV protons\n5min averaging, viewing: SUN'
     # viewing "north", combined channel, electrons
@@ -112,7 +112,7 @@ def test_onset_spectrum_tsa_SOLO_HET_online():
     assert flux.shape == (73,)
     assert len(onset_stats) == 6
     assert isinstance(onset_stats[5], pd._libs.tslibs.nattype.NaTType)  # onset_stats[5] == pd.Timestamp('2021-10-28 15:31:59.492059')
-    assert ~onset_found
+    assert not onset_found
     assert peak_time.isoformat().split('.')[0] == '2022-11-08T22:27:56'
     assert fig.get_axes()[0].get_title() == 'SOLO/HET 0.4533 - 18.8300 MeV electrons\n5min averaging, viewing: NORTH'
 
@@ -139,7 +139,7 @@ def test_onset_spectrum_tsa_SOLO_EPT_online():
     assert flux.shape == (288,)
     assert len(onset_stats) == 6
     assert isinstance(onset_stats[5], pd._libs.tslibs.nattype.NaTType)  # onset_stats[5] == pd.Timestamp('2021-10-28 15:31:59.492059')
-    assert ~onset_found
+    assert not onset_found
     assert peak_time.isoformat().split('.')[0] == '2022-06-06T01:02:31'
     assert fig.get_axes()[0].get_title() == 'SOLO/EPT 0.0608 - 0.0678 MeV protons\n5min averaging, viewing: SUN'
     # viewing "north", combined channel, electrons
@@ -150,7 +150,7 @@ def test_onset_spectrum_tsa_SOLO_EPT_online():
     assert flux.shape == (288,)
     assert len(onset_stats) == 6
     assert isinstance(onset_stats[5], pd._libs.tslibs.nattype.NaTType)  # onset_stats[5] == pd.Timestamp('2021-10-28 15:31:59.492059')
-    assert ~onset_found
+    assert not onset_found
     assert peak_time.isoformat().split('.')[0] == '2022-06-06T23:02:31'
     assert fig.get_axes()[0].get_title() == 'SOLO/EPT 0.0334 - 0.0439 MeV electrons\n5min averaging, viewing: NORTH'
 
@@ -533,6 +533,6 @@ def test_onset_Bepi_SIXS_offline():
     assert flux.shape == (161,)
     assert len(onset_stats) == 6
     assert isinstance(onset_stats[5], pd._libs.tslibs.nattype.NaTType)
-    assert ~onset_found
-    assert peak_time.isoformat().split('.')[0] == '2023-07-19T02:25:42'
+    assert not onset_found
+    assert peak_time.isoformat().split('.')[0] == '2023-07-19T02:25:30'
     assert fig.get_axes()[0].get_title() == 'BEPI/SIXS 106 keV electrons\n1min averaging, viewing: 1'

seppy/util/__init__.py

@@ -109,24 +109,13 @@ def bepicolombo_sixs_stack(path, date, side, pos_timestamp='center'):
         df.index = np.array(times)
         df = df.drop(columns=['TimeUTC'])
 
-        # TODO: (as it's not really nicely done so far)
-        # careful!
-        # adjusting the position of the timestamp manually.
-        # requires knowledge of the original time resolution and timestamp position!
-        if type(date) is datetime.datetime:
-            change_date = pd.Timestamp(2022, 8, 29)
-        elif type(date) is datetime.date:
-            change_date = pd.Timestamp(2022, 8, 29).date()
-        if date < change_date:
-            cadence = 8
-        elif date >= change_date:
-            cadence = 24
-        #
-        if pos_timestamp == 'center':
-            df.index = df.index+pd.Timedelta(f'{cadence/2}s')
-            # warnings.warn("Assuming cadence of 8s before 2022-08-29 and 24s after!")
-            custom_warning("Assuming cadence of 8s before 2022-08-29 and 24s after!")
-        elif pos_timestamp == 'start':
+        if pos_timestamp == 'start':
+            cadence1 = (df.index[1]-df.index[0]).seconds
+            cadence2 = (df.index[-1]-df.index[-2]).seconds
+            if cadence1 != cadence2:
+                custom_warning("Bepi/SIXS cadence is changing throughout the day; something is wrong!")    
+            df.index = df.index-pd.Timedelta(f'{cadence1/2}s')
+        elif pos_timestamp == 'center':
             pass
     except FileNotFoundError:
         print(f'Unable to open {filename}')

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.15'
+    __version__ = '0.1.17'

{seppy-0.1.15.dist-info → seppy-0.1.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: seppy
-Version: 0.1.15
+Version: 0.1.17
 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.15.dist-info → seppy-0.1.17.dist-info}/RECORD

@@ -1,5 +1,5 @@
 seppy/__init__.py,sha256=M8ZBbGj0r_XdNVLzaSXF38M4wyzAgUX32LXcSYh5O5A,254
-seppy/version.py,sha256=86lr4VUTfCM5Saeoz0h6DkiA3FNlIbon3BsAepb63G0,346
+seppy/version.py,sha256=ZfyBAus4lEppBW04TYAwcehqpK2ZB149Kdo9PHYeWVg,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
@@ -14,16 +14,16 @@ seppy/loader/psp.py,sha256=PbxCEW-06d2I_JGIfIAqqXMU_uPdQFhmh-fUoXpzz9k,31535
 seppy/loader/soho.py,sha256=EIFKde1dGpT9yU6bU-XtTsHUCvTEkzHhdPOOMtqVrDU,20262
 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_tools.py,sha256=NrKXrlgCsy9RRx2V7fUGRtB1l8N0_CXasyGjoB_lSNU,31518
+seppy/tests/test_tools.py,sha256=LQPekw-ddse88OYu-LWChFcJPT2SwGS7uEG1tKRLVok,31539
 seppy/tools/__init__.py,sha256=Ge3lQ9zVRJ27aaHSet2I1wQ9tD4emVfjnn49pUGcoiY,116086
 seppy/tools/swaves.py,sha256=OcohPXLko0ik9FLyYMVkYxI75W4XzOKvQ2Ylnwi-wlQ,3139
 seppy/tools/widgets.py,sha256=atQj9vvus0UgrUV6vlPcTdjpaidnERUevOp6FUmGLSI,6820
-seppy/util/__init__.py,sha256=0J3DNmOdh9X8a-uZy0yfFe1ubFSfcF5b7K4RMSJvGHA,15705
-seppy-0.1.15.dist-info/LICENSE.rst,sha256=SxptLPCIHKdfDjyguGdC7ai6Eze-Vz_t1jdqC8h19js,1473
-seppy-0.1.15.dist-info/METADATA,sha256=Q4NN8Ku265gLCQGT1Ys81X1Uml6Hlk2Q2jwY5_tEdqw,4374
-seppy-0.1.15.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-seppy-0.1.15.dist-info/top_level.txt,sha256=G2Op1GREPmbCX81isNhYY_7ZZyLWLIm-MJC04J4Fgc4,6
-seppy-0.1.15.dist-info/RECORD,,
+seppy/util/__init__.py,sha256=RMMeH37L75wwQPHb_-_-2Rk7lzlDtBC2K6lkWKtxAMg,15253
+seppy-0.1.17.dist-info/LICENSE.rst,sha256=SxptLPCIHKdfDjyguGdC7ai6Eze-Vz_t1jdqC8h19js,1473
+seppy-0.1.17.dist-info/METADATA,sha256=zEKt2cdJMiv7iEUN_cuk8K24xvPOlHsirjA0n70h1ns,4398
+seppy-0.1.17.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+seppy-0.1.17.dist-info/top_level.txt,sha256=G2Op1GREPmbCX81isNhYY_7ZZyLWLIm-MJC04J4Fgc4,6
+seppy-0.1.17.dist-info/RECORD,,

{seppy-0.1.15.dist-info → seppy-0.1.17.dist-info}/WHEEL

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