sscws 2.4__tar.gz → 2.4.2__tar.gz

{sscws-2.4/sscws.egg-info → sscws-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sscws
-Version: 2.4
+Version: 2.4.2
 Summary: NASA's Satellite Situation Center Web Service Client Library
 Home-page: https://sscweb.gsfc.nasa.gov/WebServices/REST
 Author: Bernie Harris
@@ -14,9 +14,8 @@ Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: System Administrators
-Classifier: Operating System :: MacOS :: MacOS X
-Classifier: Operating System :: Microsoft :: Windows
-Classifier: Operating System :: POSIX
+Classifier: License :: OSI Approved :: NASA Open Source Agreement v1.3 (NASA-1.3)
+Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
@@ -28,9 +27,11 @@ License-File: LICENSE
 
 ## Synopsis
 
-This library provides a simple python interface to 
 NASA's [Satellite Situation Center](https://sscweb.gsfc.nasa.gov/)
-(SSC).  This library implements the client side of the 
+(SSC) is a system to cast geocentric spacecraft location information 
+into a framework of (empirical) geophysical regions and mappings of 
+spacecraft locations along lines of the Earth's magnetic field.  
+This library implements the client side of the 
 [SSC RESTful web services](https://sscweb.gsfc.nasa.gov/WebServices/REST/).
 For more general details about the SSC web services, see
 https://sscweb.gsfc.nasa.gov/WebServices/REST/.
@@ -60,7 +61,7 @@ different features of the library:
 4. [Magnetic Field Line Conjunction Example](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.html) ([ipynb file](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.ipynb)) with related data retrieval/plotting using [cdasws](https://pypi.org/project/cdasws/).
 
 These notebooks are also available on 
-[Binder](https://mybinder.org/v2/gh/berniegsfc/sscws-notebooks/main).
+[Binder](https://binder.opensci.2i2c.cloud/v2/gh/berniegsfc/sscws-notebooks/main).
 
 ## Motivation
 

{sscws-2.4 → sscws-2.4.2}/README.md

@@ -1,9 +1,11 @@
 
 ## Synopsis
 
-This library provides a simple python interface to 
 NASA's [Satellite Situation Center](https://sscweb.gsfc.nasa.gov/)
-(SSC).  This library implements the client side of the 
+(SSC) is a system to cast geocentric spacecraft location information 
+into a framework of (empirical) geophysical regions and mappings of 
+spacecraft locations along lines of the Earth's magnetic field.  
+This library implements the client side of the 
 [SSC RESTful web services](https://sscweb.gsfc.nasa.gov/WebServices/REST/).
 For more general details about the SSC web services, see
 https://sscweb.gsfc.nasa.gov/WebServices/REST/.
@@ -33,7 +35,7 @@ different features of the library:
 4. [Magnetic Field Line Conjunction Example](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.html) ([ipynb file](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.ipynb)) with related data retrieval/plotting using [cdasws](https://pypi.org/project/cdasws/).
 
 These notebooks are also available on 
-[Binder](https://mybinder.org/v2/gh/berniegsfc/sscws-notebooks/main).
+[Binder](https://binder.opensci.2i2c.cloud/v2/gh/berniegsfc/sscws-notebooks/main).
 
 ## Motivation
 

{sscws-2.4 → sscws-2.4.2}/setup.py

@@ -10,7 +10,7 @@ README = (HERE / "README.md").read_text()
 # This call to setup() does all the work
 setup(
     name="sscws",
-    version="2.4",
+    version="2.4.2",
     description="NASA's Satellite Situation Center Web Service Client Library",
     long_description=README,
     long_description_content_type="text/markdown",
@@ -25,7 +25,7 @@ setup(
     install_requires=["python-dateutil>=2.8.0", "requests>=2.20", "numpy>=1.19.4"],
     extras_require={
         'plot': ["matplotlib>=3.3.2"],
-        'cdf': ["cdflib>=0.4.9,<1.0"]
+        'cdf': ["cdflib>=0.4.9"]
     },
     keywords=["heliophysics", "satellites", "trajectories", "orbits", "location", "conjunctions", "earth magnetic field", "ephemeris", "space physics", "spdf", "ssc"],
     classifiers=[
@@ -35,10 +35,8 @@ setup(
         "Intended Audience :: End Users/Desktop",
         "Intended Audience :: Developers",
         "Intended Audience :: System Administrators",
-#        "License :: OSI Approved :: NASA Open Source Agreement",
-        "Operating System :: MacOS :: MacOS X",
-        "Operating System :: Microsoft :: Windows",
-        "Operating System :: POSIX",
+        "License :: OSI Approved :: NASA Open Source Agreement v1.3 (NASA-1.3)",
+        "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Topic :: Scientific/Engineering :: Physics",
         "Topic :: Software Development :: Libraries :: Python Modules"

{sscws-2.4 → sscws-2.4.2}/sscws/__init__.py

@@ -55,7 +55,7 @@ Notes
 """
 
 
-__version__ = "2.4"
+__version__ = "2.4.2"
 
 
 #

{sscws-2.4 → sscws-2.4.2}/sscws/__main__.py

@@ -46,7 +46,7 @@ import xml.etree.ElementTree as ET
 import logging
 import logging.config
 from typing import List
-from datetime import timedelta
+#from datetime import timedelta
 import time
 import urllib3
 import numpy as np
@@ -65,7 +65,7 @@ from sscws.sscws import SscWs
 from sscws.bfieldmodels import BFieldModel, Tsyganenko89cBFieldModel
 try:
     from sscws.cdf import Cdf
-    CDF_AVAILABLE = True 
+    CDF_AVAILABLE = True
 except ImportError:
     CDF_AVAILABLE = False
 from sscws.conjunctions import BoxConjunctionArea, ConditionOperator,\
@@ -297,30 +297,6 @@ def example(
         print('skipping get_locations2')
 
 
-    """
-    cdf = Cdf()
-    cdf.open('themisa_20230523085913_101794.cdf')
-    #for name in cdf.get_variable_names():
-    #    var_info = cdf.get_variable_info(name)
-    #    print(var_info)
-    #    data = cdf.get_variable_data(name, 0, var_info['Last_Rec'])
-    #    print(data)
-
-    #stop_altitude = cdf.get_b_trace_stop_altitude()
-    #print('stop_altitude:', stop_altitude)
-    #sat_name = cdf.get_satellite_name()
-    #print('sat_name:', sat_name)
-    sat_data = cdf.get_satellite_data()
-    #print('sat_data:', sat_data)
-    result = {
-        'Data': np.empty(1, dtype=object)
-    }
-    result['Data'][0] = sat_data
-    #print('result = ', result)
-    SscWs.print_locations_result(result)
-    return
-    """
-
     # A conjunction query request
     query_request = create_example_query_request()
     #print('request:')
@@ -342,6 +318,35 @@ def example(
 
 # pylint: enable=too-many-locals,too-many-branches,too-many-statements
 
+
+def test_cdf(
+    ) -> None:
+    """
+    Tests reading an ssc cdf and printing some values.
+
+    """
+    cdf = Cdf()
+    cdf.open('themisa_20230523085913_101794.cdf')
+    #for name in cdf.get_variable_names():
+    #    var_info = cdf.get_variable_info(name)
+    #    print(var_info)
+    #    data = cdf.get_variable_data(name, 0, var_info['Last_Rec'])
+    #    print(data)
+
+    stop_altitude = cdf.get_b_trace_stop_altitude()
+    print('stop_altitude:', stop_altitude)
+    #sat_name = cdf.get_satellite_name()
+    #print('sat_name:', sat_name)
+    sat_data = cdf.get_satellite_data()
+    #print('sat_data:', sat_data)
+    result = {
+        'Data': np.empty(1, dtype=object)
+    }
+    result['Data'][0] = sat_data
+    #print('result = ', result)
+    SscWs.print_locations_result(result)
+
+
 #########################
 def create_swarma_btrace_request(
     ) -> ET:
@@ -547,4 +552,5 @@ def create_example_query_request(
 
 
 if __name__ == '__main__':
+    #test_cdf()
     example(sys.argv)

{sscws-2.4 → sscws-2.4.2}/sscws/cdf.py

@@ -173,7 +173,11 @@ class Cdf:
             A list of the variable names.
         """
 
-        return self._info['rVariables'] + self._info['zVariables']
+        try:
+            return self._info['rVariables'] + self._info['zVariables']
+        except TypeError:
+            # cdflib >= 1.0
+            return self._info.rVariables + self._info.zVariables
 
 
     def get_variable_info(
@@ -266,7 +270,12 @@ class Cdf:
         str
             Value of the Source_name global attribute.
         """
-        return self._global_attributes['Source_name']
+        name = self._global_attributes['Source_name']
+
+        if isinstance(name, list):    # cdflib >= 1.0
+            name = name[0]
+
+        return name
 
 
     def get_satellite_name(
@@ -300,7 +309,12 @@ class Cdf:
 
         for name in self.get_variable_names():
             var_info = self.get_variable_info(name)
-            data = self.get_variable_data(name, 0, var_info['Last_Rec'])
+            try:
+                last_rec = var_info['Last_Rec']
+            except TypeError:
+                # cdflib >= 1.0
+                last_rec = var_info.Last_Rec
+            data = self.get_variable_data(name, 0, last_rec)
 
             matcher = XYZ_PATTERN.match(name)
 
@@ -348,7 +362,12 @@ class Cdf:
 
         name = 'Epoch'
         var_info = self.get_variable_info(name)
-        epoch = self.get_variable_data(name, 0, var_info['Last_Rec'])
+        try:
+            last_rec = var_info['Last_Rec']
+        except TypeError:
+            # cdflib >= 1.0
+            last_rec = var_info.Last_Rec
+        epoch = self.get_variable_data(name, 0, last_rec)
 
         datetimes = cdflib.cdfepoch.to_datetime(epoch)
 
@@ -377,7 +396,12 @@ class Cdf:
 
         for name in self.get_variable_names():
             var_info = self.get_variable_info(name)
-            data = self.get_variable_data(name, 0, var_info['Last_Rec'])
+            try:
+                last_rec = var_info['Last_Rec']
+            except TypeError:
+                # cdflib >= 1.0
+                last_rec = var_info.Last_Rec
+            data = self.get_variable_data(name, 0, last_rec)
 
             matcher = B_TRACE_PATTERN.match(name)
 
@@ -429,7 +453,12 @@ class Cdf:
         """
 
         var_info = self.get_variable_info(name)
-        return self.get_variable_data(name, 0, var_info['Last_Rec'])
+        try:
+            last_rec = var_info['Last_Rec']
+        except TypeError:
+            # cdflib >= 1.0
+            last_rec = var_info.Last_Rec
+        return self.get_variable_data(name, 0, last_rec)
 
 
     def get_spacecraft_region(

{sscws-2.4 → sscws-2.4.2}/sscws/sscws.py

@@ -514,7 +514,7 @@ class SscWs:
         are compatible with `SscWs.get_locations` except that the numpy 
         array of datetime.datetime values are returned as a numpy array 
         of numpy.datetime64 values.  This method requires the 
-        cdflib < 1.0 module to be installed.
+        cdflib module to be installed.
 
         See Also
         --------
@@ -1008,7 +1008,12 @@ class SscWs:
                         print(f"{'Time':25s} {'B Strength GSE':^30s}")
                         print(f"{'':25s} {'X':^9s} {'Y':^9s} {'Z':^9s}")
                         for index in range(min_len):
-                            print((f"{data['Time'][index].isoformat():25s} "
+                            bgse_time = data['Time'][index]
+                            try:
+                                iso_time = bgse_time.isoformat()
+                            except AttributeError:
+                                iso_time = str(bgse_time)
+                            print((f"{iso_time:25s} "
                                    f"{data['BGseX'][index]:9.6f} "
                                    f"{data['BGseY'][index]:9.6f} "
                                    f"{data['BGseZ'][index]:9.6f}"))

{sscws-2.4 → sscws-2.4.2/sscws.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sscws
-Version: 2.4
+Version: 2.4.2
 Summary: NASA's Satellite Situation Center Web Service Client Library
 Home-page: https://sscweb.gsfc.nasa.gov/WebServices/REST
 Author: Bernie Harris
@@ -14,9 +14,8 @@ Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: System Administrators
-Classifier: Operating System :: MacOS :: MacOS X
-Classifier: Operating System :: Microsoft :: Windows
-Classifier: Operating System :: POSIX
+Classifier: License :: OSI Approved :: NASA Open Source Agreement v1.3 (NASA-1.3)
+Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
@@ -28,9 +27,11 @@ License-File: LICENSE
 
 ## Synopsis
 
-This library provides a simple python interface to 
 NASA's [Satellite Situation Center](https://sscweb.gsfc.nasa.gov/)
-(SSC).  This library implements the client side of the 
+(SSC) is a system to cast geocentric spacecraft location information 
+into a framework of (empirical) geophysical regions and mappings of 
+spacecraft locations along lines of the Earth's magnetic field.  
+This library implements the client side of the 
 [SSC RESTful web services](https://sscweb.gsfc.nasa.gov/WebServices/REST/).
 For more general details about the SSC web services, see
 https://sscweb.gsfc.nasa.gov/WebServices/REST/.
@@ -60,7 +61,7 @@ different features of the library:
 4. [Magnetic Field Line Conjunction Example](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.html) ([ipynb file](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.ipynb)) with related data retrieval/plotting using [cdasws](https://pypi.org/project/cdasws/).
 
 These notebooks are also available on 
-[Binder](https://mybinder.org/v2/gh/berniegsfc/sscws-notebooks/main).
+[Binder](https://binder.opensci.2i2c.cloud/v2/gh/berniegsfc/sscws-notebooks/main).
 
 ## Motivation
 

{sscws-2.4 → sscws-2.4.2}/sscws.egg-info/requires.txt

@@ -3,7 +3,7 @@ requests>=2.20
 numpy>=1.19.4
 
 [cdf]
-cdflib<1.0,>=0.4.9
+cdflib>=0.4.9
 
 [plot]
 matplotlib>=3.3.2