seppy 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

seppy/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.2.0'
-__version_tuple__ = version_tuple = (0, 2, 0)
+__version__ = version = '0.2.1'
+__version_tuple__ = version_tuple = (0, 2, 1)

seppy/loader/psp.py

@@ -199,8 +199,8 @@ def psp_isois_load(dataset, startdate, enddate, epilo_channel='F', epilo_thresho
         Name of PSP dataset:
             - 'PSP_ISOIS-EPIHI_L2-HET-RATES60'
             - 'PSP_ISOIS-EPIHI_L2-HET-RATES3600' (higher coverage than 'RATES60' before mid-2021)
-            - 'PSP_ISOIS-EPIHI_L2-LET1-RATES60' (not yet supported)
-            - 'PSP_ISOIS-EPIHI_L2-LET2-RATES60' (not yet supported)
+            - 'PSP_ISOIS-EPIHI_L2-LET1-RATES60'
+            - 'PSP_ISOIS-EPIHI_L2-LET2-RATES60'
             - 'PSP_ISOIS-EPILO_L2-PE'
             - 'PSP_ISOIS-EPILO_L2-IC'
     startdate, enddate : {datetime or str}

seppy/util/__init__.py

@@ -1,5 +1,6 @@
 
 import datetime
+import psutil
 import warnings
 
 import astropy.constants as const
@@ -429,3 +430,14 @@ def intensity2vsd(species, kinetic_energy, intensity):
         p = energy2momentum(species, kinetic_energy)
         f = intensity / (p**2) * mass_dict[species]**3
         return f.to(u.s**3/(u.sr*u.cm**6))
+
+
+def jupyterhub_data_path(path_org, path_hub='/home/jovyan/data'):
+    """
+    Checks if Notebook is run within SOLER/SERPENTINE JupyterHub. Returns the path of a common data folder if yes, and the original path if not.
+    """
+    if (psutil.Process().parent().name() == 'jupyterhub-sing') and all(x in psutil.Process().parent().environ()['PYTHONPATH'] for x in ['/home/jovyan/serpentine/', '/home/jovyan/soler/sep_tools/']):
+        print(f"JupyterHub detected. Adjusting data path to {path_hub}")
+        return path_hub
+    else:
+        return path_org

seppy/version.py

@@ -14,4 +14,4 @@ except Exception:
     )
     del warnings
 
-    version = '0.2.0'
+    version = '0.2.1'

{seppy-0.2.0.dist-info → seppy-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: seppy
-Version: 0.2.0
+Version: 0.2.1
 Summary: SEPpy
 Author-email: Jan Gieseler <jan.gieseler@utu.fi>
 License-Expression: BSD-3-Clause

{seppy-0.2.0.dist-info → seppy-0.2.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 seppy/__init__.py,sha256=hk6JGncma6FHC5b8g5ZelvpsF1Jo-3Pz_3MneUcNWMg,156
-seppy/_version.py,sha256=iB5DfB5V6YB5Wo4JmvS-txT42QtmGaWcWp3udRT7zCI,511
-seppy/version.py,sha256=PZgPleE6XAqu6r2weGUc7loda2-omM0TFm57cWOPdnA,531
+seppy/_version.py,sha256=UoNvMtd4wCG76RwoSpNCUtaFyTwakGcZolfjXzNVSMY,511
+seppy/version.py,sha256=s9jrGGO9QQFBgDmuFff6kUkpz-CIO0Sx5J3q0nn2YLU,531
 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
@@ -11,7 +11,7 @@ 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=jIXzuOBL5Fi8LMJTqltGrpmlUauvtb0XXqqvO8UtPbE,32045
+seppy/loader/psp.py,sha256=cOunehm9gvUl9hVF2CgAqje1aA6r4HGhvEnHkvddFyU,32005
 seppy/loader/soho.py,sha256=e6SzUD_WxUiaAMlWQcTGVvdER4Wv9rI-PtCCEoUHVRw,20290
 seppy/loader/solo.py,sha256=Nst2ZJU2yH5NHsB6M_69ryVfzt978hbmqhxaHZJREVg,3054
 seppy/loader/stereo.py,sha256=dkfxPiwCFmn9UfD0QYoIBW6rx6-faXjjk8IU2WMN-j4,24823
@@ -24,9 +24,9 @@ seppy/tests/tsa_org.png,sha256=80xrGx1unP1iXGLhPsKHHqMLrg2qhivsGh532hBVCqM,13850
 seppy/tools/__init__.py,sha256=GwxGektqXHmqbuFCAW66XreGOp0PJImqujN0swlBmKE,117677
 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.2.0.dist-info/licenses/LICENSE.rst,sha256=O5RzTapB1HKcaagHaoNKHBvjkzU6Kh1Ax6HZ_9Q4-kI,1520
-seppy-0.2.0.dist-info/METADATA,sha256=aLfWO8hX9DFftOSgYAYoF9j9khWbnOxr_KGX1QfPiTo,4670
-seppy-0.2.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-seppy-0.2.0.dist-info/top_level.txt,sha256=G2Op1GREPmbCX81isNhYY_7ZZyLWLIm-MJC04J4Fgc4,6
-seppy-0.2.0.dist-info/RECORD,,
+seppy/util/__init__.py,sha256=49gq3JkFcpZw65HPNslUnMjJ1wdVtJc-bbymPhb78I4,15826
+seppy-0.2.1.dist-info/licenses/LICENSE.rst,sha256=O5RzTapB1HKcaagHaoNKHBvjkzU6Kh1Ax6HZ_9Q4-kI,1520
+seppy-0.2.1.dist-info/METADATA,sha256=Lw_qh2vBRO2Qt1UdwyvDofJNwUudbCcrwzpwO0nLFJc,4670
+seppy-0.2.1.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+seppy-0.2.1.dist-info/top_level.txt,sha256=G2Op1GREPmbCX81isNhYY_7ZZyLWLIm-MJC04J4Fgc4,6
+seppy-0.2.1.dist-info/RECORD,,

{seppy-0.2.0.dist-info → seppy-0.2.1.dist-info}/WHEEL

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