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

seppy/tests/test_tools.py

@@ -1,4 +1,3 @@
-
 from astropy.utils.data import get_pkg_data_filename
 from pathlib import Path
 from seppy.tools import Event
@@ -26,9 +25,9 @@ def test_onset_spectrum_tsa_SOLO_STEP_ions_old_data_online():
     assert isinstance(flux, pd.Series)
     assert flux.shape == (288,)
     assert len(onset_stats) == 6
-    assert onset_stats[5].isoformat().split('.')[0] == '2020-09-21T17:27:32'
+    assert onset_stats[5].isoformat().split('.')[0] == '2020-09-21T17:27:37'
     assert onset_found
-    assert peak_time.isoformat().split('.')[0] == '2020-09-21T17:57:32'
+    assert peak_time.isoformat().split('.')[0] == '2020-09-21T17:57:37'
     assert fig.get_axes()[0].get_title() == 'SOLO/STEP 0.0060 - 0.0091 MeV/n protons\n5min averaging, viewing: PIXEL AVERAGED'
     # Pixel 8 - check that calculation is stopped bc. this data is not implemented correctly!
     check = False
@@ -64,7 +63,7 @@ def test_onset_spectrum_tsa_SOLO_STEP_ions_new_data_online():
     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 peak_time.isoformat().split('.')[0] == '2022-01-09T01:32:30'
+    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
     flux, onset_stats, onset_found, peak_flux, peak_time, fig, bg_mean = Event1.find_onset(viewing='Pixel 8', background_range=background_range, channels=1, resample_period="5min", yscale='log', cusum_window=30)
@@ -73,7 +72,7 @@ def test_onset_spectrum_tsa_SOLO_STEP_ions_new_data_online():
     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 peak_time.isoformat().split('.')[0] == '2022-01-09T00:02:30'
+    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'
 
     # TODO: deactivated, as this function is deactivated atm:
@@ -103,7 +102,7 @@ def test_onset_spectrum_tsa_SOLO_HET_online():
     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 peak_time.isoformat().split('.')[0] == '2022-11-08T17:57:54'
+    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
     Event1 = Event(spacecraft='Solar Orbiter', sensor='HET', viewing='sun', data_level='l2', species='electrons', start_date=startdate, end_date=enddate, data_path=lpath)
@@ -114,7 +113,7 @@ def test_onset_spectrum_tsa_SOLO_HET_online():
     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 peak_time.isoformat().split('.')[0] == '2022-11-08T22:27:54'
+    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'
 
     # test dynamic spectrum:
@@ -141,7 +140,7 @@ def test_onset_spectrum_tsa_SOLO_EPT_online():
     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 peak_time.isoformat().split('.')[0] == '2022-06-06T01:02:30'
+    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
     Event1 = Event(spacecraft='Solar Orbiter', sensor='EPT', viewing='sun', data_level='l2', species='electrons', start_date=startdate, end_date=enddate, data_path=lpath)
@@ -152,7 +151,7 @@ def test_onset_spectrum_tsa_SOLO_EPT_online():
     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 peak_time.isoformat().split('.')[0] == '2022-06-06T23:02:30'
+    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'
 
     # test dynamic spectrum:
@@ -440,12 +439,15 @@ def test_onset_spectrum_tsa_SOHO_EPHIN_online():
     # no channel combination inlcuded for SOHO/EPHIN electrons, yet
 
     # test dynamic spectrum:
-    check = False
-    try:
-        Event1.dynamic_spectrum(view=None)
-    except Warning:
-        check = True
-    assert check
+    # check = False
+    # try:
+    #     Event1.dynamic_spectrum(view=None)
+    # except Warning:
+    #     check = True
+    # assert check
+    Event1.dynamic_spectrum(view=None)
+    assert Event1.fig.get_axes()[0].get_title() == 'SOHO/EPHIN electrons, 2021-10-28'
+
 
     # test tsa plot:
     plt.close('all')  # in order to pick the right figure, make sure all previous are closed
@@ -515,3 +517,22 @@ def test_dynamic_spectrum_SOHO_ERNE_offline():
     Event1.dynamic_spectrum(view=None)
 
     assert Event1.fig.get_axes()[0].get_title() == 'SOHO/ERNE protons, 2021-10-28'
+
+
+def test_onset_Bepi_SIXS_offline():
+    startdate = datetime.date(2023, 7, 19)
+    enddate = datetime.date(2023, 7, 19)
+    fullpath = get_pkg_data_filename('data/test/20230719_side1.csv', package='seppy')
+    lpath = Path(fullpath).parent.as_posix()
+    # lpath = '/home/jagies/data/bepi/bc_mpo_sixs/data_csv/cruise/sixs-p/raw'
+    Event1 = Event(spacecraft='Bepi', sensor='SIXS', data_level='l2', species='electrons', start_date=startdate, end_date=enddate, data_path=lpath, viewing='1')
+    background_range = (datetime.datetime(2023, 7, 19, 0, 30, 0), datetime.datetime(2023, 7, 19, 1, 30, 0))
+    flux, onset_stats, onset_found, peak_flux, peak_time, fig, bg_mean = Event1.find_onset(viewing='1', background_range=background_range, channels=2, resample_period="1min", yscale='log', cusum_window=30)
+
+    assert isinstance(flux, pd.Series)
+    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 fig.get_axes()[0].get_title() == 'BEPI/SIXS 106 keV electrons\n1min averaging, viewing: 1'

seppy/tools/__init__.py

@@ -1616,8 +1616,13 @@ class Event:
                 s_identifier = "protons"
             if instrument.lower() == "ephin":
                 particle_data = self.current_df_e
+                # Here drop the E300 channel altogether from the dataframe if the data is produced after Oct 4, 2017,
+                # for it contains no valid data. Keyword axis==1 refers to the columns axis.
+                if self.start_date > pd.to_datetime("2017-10-04").date():
+                    particle_data = particle_data.drop("E300", axis=1)
+
                 s_identifier = "electrons"
-                raise Warning('SOHO/EPHIN is not implemented yet in the dynamic spectrum tool!')
+                # raise Warning('SOHO/EPHIN is not implemented yet in the dynamic spectrum tool!')
 
         if spacecraft == "psp":
             if instrument.lower() == "isois-epihi":
@@ -2302,11 +2307,11 @@ class Event:
                 energy_ranges = self.current_energies["channels_dict_df_p"]["ch_strings"].values
             if self.sensor.lower() == "ephin":
                 # Choose only the first 4 channels (E150, E300, E1300 and E3000)
-                # This are the only electron channels (rest p and He), and we
+                # These are the only electron channels (rest are p and He), and we
                 # use only electron data here.
                 energy_ranges = [val for val in self.current_energies.values()][:4]
             if self.sensor.lower() in ("ephin-5", "ephin-15"):
-                energy_ranges = [value for key, value in self.current_energies.items()]
+                energy_ranges = [value for _, value in self.current_energies.items()]
 
         if self.spacecraft == "psp":
             energy_dict = self.meta

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.13'
+    __version__ = '0.1.15'

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seppy
-Version: 0.1.13
+Version: 0.1.15
 Summary: SEPpy
 Home-page: https://github.com/serpentine-h2020/SEPpy
 Author: Jan Gieseler
@@ -14,6 +14,8 @@ Classifier: Programming Language :: Python
 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: Programming Language :: Python :: 3.12
 Classifier: Topic :: Scientific/Engineering :: Physics
 Requires-Python: >=3.8
 License-File: licenses/LICENSE.rst
@@ -21,28 +23,23 @@ Requires-Dist: astropy
 Requires-Dist: astroquery
 Requires-Dist: bs4
 Requires-Dist: cdflib
-Requires-Dist: datetime
-Requires-Dist: drms
-Requires-Dist: h5netcdf
-Requires-Dist: ipykernel
 Requires-Dist: ipywidgets
-Requires-Dist: lxml
 Requires-Dist: matplotlib
+Requires-Dist: mpl-animators>=1.0.0
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: pooch
 Requires-Dist: requests
 Requires-Dist: solo-epd-loader
-Requires-Dist: sunpy >=4.1.0
-Requires-Dist: zeep
+Requires-Dist: sunpy>=4.1.0
 Provides-Extra: all
 Provides-Extra: docs
-Requires-Dist: sphinx ; extra == 'docs'
-Requires-Dist: sphinx-automodapi ; 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'
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-doctestplus; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
 
 seppy
 =====

{seppy-0.1.13.dist-info → seppy-0.1.15.dist-info}/RECORD

@@ -1,7 +1,9 @@
 seppy/__init__.py,sha256=M8ZBbGj0r_XdNVLzaSXF38M4wyzAgUX32LXcSYh5O5A,254
-seppy/version.py,sha256=8Iy3vCG3vhcccNaZYD_PmgkO2Pa648hsFWtY-EcVMeY,346
+seppy/version.py,sha256=86lr4VUTfCM5Saeoz0h6DkiA3FNlIbon3BsAepb63G0,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
 seppy/data/test/epi21106.rl2,sha256=Fhq5A5D1pKqEfV9mx6T8tjEei4HmSfmWBR0XaLJl_JI,180858
-seppy/data/test/psp_isois-epihi_l2-het-rates60_20210531_v15.cdf,sha256=u0XcZ9SpocPwuKAmu7w2qDU_yLXxg3eyf0VXvayWlT4,401828
 seppy/data/test/sept_ahead_ele_sun_2006_318_1min_l2_v03.dat,sha256=ReZ7cvIcC4Z_nDJ-oJQ7lsKSziA_qlZsAG74F5n3M2o,167882
 seppy/data/test/soho_erne-hed_l2-1min_20211028_v01.cdf,sha256=RX1XX6eQevCuXqc1tTAEjPsXtlgbDeP2DsmRFVbsGwg,278505
 seppy/data/test/solo_l2_mag-rtn-normal-1-minute_20210712_v01.cdf,sha256=Tc_-3YQMVGDwJgN1td2iqTPGfCF7YwmuyYZ2G0NiSoY,59249
@@ -14,14 +16,14 @@ 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/tests/__init__.py,sha256=1D-l3TVbwIZHY78A-sB7kc4ldldX8ZaEq-Ntph51WVw,108
-seppy/tests/test_loader.py,sha256=FJYsr3W1AXb1VxIrLG9iLzh9hNvPlkWLBUElndM9_xo,7648
-seppy/tests/test_tools.py,sha256=wgIAAuXsm4CtSm30usqMr5mUCteBntHAiHXzzlvl62A,30201
-seppy/tools/__init__.py,sha256=QxQ2VlGm934rnffYLnUkWdkL6GMqK29h544m7UDdqeI,115724
+seppy/tests/test_loader.py,sha256=mt52vrAeSEtJ-od4Cqt0HrscN_ykKNHklGZm8OTZjLs,7767
+seppy/tests/test_tools.py,sha256=NrKXrlgCsy9RRx2V7fUGRtB1l8N0_CXasyGjoB_lSNU,31518
+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.13.dist-info/LICENSE.rst,sha256=SxptLPCIHKdfDjyguGdC7ai6Eze-Vz_t1jdqC8h19js,1473
-seppy-0.1.13.dist-info/METADATA,sha256=1peJsOrI-RvGReYt3MtMqjwyW_SHuE12bJKHv9WMtnc,4375
-seppy-0.1.13.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-seppy-0.1.13.dist-info/top_level.txt,sha256=G2Op1GREPmbCX81isNhYY_7ZZyLWLIm-MJC04J4Fgc4,6
-seppy-0.1.13.dist-info/RECORD,,
+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-0.1.13.dist-info → seppy-0.1.15.dist-info}/WHEEL

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