sprit 0.1.67.dev0__tar.gz → 0.1.70.dev0__tar.gz

{sprit-0.1.67.dev0/sprit.egg-info → sprit-0.1.70.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sprit
-Version: 0.1.67.dev0
+Version: 0.1.70.dev0
 Summary: A package for processing and analyzing HVSR (Horizontal to Vertical Spectral Ratio) data
 Author: Riley Balikian, Hongyu Xaio
 Author-email: balikian@illinois.edu
@@ -83,18 +83,12 @@ For troubleshooting issues with installation or usage of the sprit package, see
 Aside from the modules in the python standard library, the following package dependencies must be installed in your environment for this package to work
 
 - [Obspy](https://docs.obspy.org/): Python framework for processing seismological data
+- [Matplotlib](https://matplotlib.org/): Comprehensive library for creating static, animated, and interactive visualizations in python
 - [Numpy](https://matplotlib.org/): "The fundamental package for scientific computing with Python"
 - [Scipy](https://scipy.org/): "Fundamental algorithms for scientific computing in Python"
-- [Pandas](https://pandas.pydata.org): "A fast, powerful, flexible and easy to use open source data analysis and manipulation tool"
-- [pyproj](https://pyproj4.github.io/pyproj/stable/): Module for cartographic projections and coordinate transformations, a python interface to [PROJ](https://proj.org/en/9.2/)
-- [Matplotlib](https://matplotlib.org/): Comprehensive library for creating static, animated, and interactive visualizations in python
-- plotly
-
-## Dependencies specifically for GUIs
+- [Pandas](https://pandas.pydata.org): "A fast, powerful, flexible and easy to use open source data analysis and manipulation tool" (Used primarily for exporting and managing results)
 - [pyqt5-sip](https://pypi.org/project/PyQt5): Python binding of Qt GUI toolkit (used for window selection in jupyter notebooks)
-- ipython
-- ipywidgets
-- nbformat 
+- [pyproj](https://pyproj4.github.io/pyproj/stable/): Module for cartographic projections and coordinate transformations, a python interface to [PROJ](https://proj.org/en/9.2/)
 
 # References
 - <a id="1">[1]</a> <http://sesame.geopsy.org/Delivrables/SESAME-Finalreport_april05.pdf>

{sprit-0.1.67.dev0 → sprit-0.1.70.dev0}/README.md

@@ -32,18 +32,12 @@ For troubleshooting issues with installation or usage of the sprit package, see
 Aside from the modules in the python standard library, the following package dependencies must be installed in your environment for this package to work
 
 - [Obspy](https://docs.obspy.org/): Python framework for processing seismological data
+- [Matplotlib](https://matplotlib.org/): Comprehensive library for creating static, animated, and interactive visualizations in python
 - [Numpy](https://matplotlib.org/): "The fundamental package for scientific computing with Python"
 - [Scipy](https://scipy.org/): "Fundamental algorithms for scientific computing in Python"
-- [Pandas](https://pandas.pydata.org): "A fast, powerful, flexible and easy to use open source data analysis and manipulation tool"
-- [pyproj](https://pyproj4.github.io/pyproj/stable/): Module for cartographic projections and coordinate transformations, a python interface to [PROJ](https://proj.org/en/9.2/)
-- [Matplotlib](https://matplotlib.org/): Comprehensive library for creating static, animated, and interactive visualizations in python
-- plotly
-
-## Dependencies specifically for GUIs
+- [Pandas](https://pandas.pydata.org): "A fast, powerful, flexible and easy to use open source data analysis and manipulation tool" (Used primarily for exporting and managing results)
 - [pyqt5-sip](https://pypi.org/project/PyQt5): Python binding of Qt GUI toolkit (used for window selection in jupyter notebooks)
-- ipython
-- ipywidgets
-- nbformat 
+- [pyproj](https://pyproj4.github.io/pyproj/stable/): Module for cartographic projections and coordinate transformations, a python interface to [PROJ](https://proj.org/en/9.2/)
 
 # References
 - <a id="1">[1]</a> <http://sesame.geopsy.org/Delivrables/SESAME-Finalreport_april05.pdf>

{sprit-0.1.67.dev0 → sprit-0.1.70.dev0}/pyproject.toml

@@ -7,7 +7,7 @@ name = "sprit"
 authors = [{name="Riley Balikian"}, {name="Hongyu Xaio"}]
 dynamic = ["readme"]
 license = {file = "LICENSE"}
-version="0.1.67-dev"
+version="0.1.70-dev"
 description = "A package for processing and analyzing HVSR (Horizontal to Vertical Spectral Ratio) data"
 keywords = ["HVSR", "seismic", "horizontal to vertical spectral ratio", "obspy", 'geology', 'geophysics', 'geotechnical']
 requires-python = ">=3.9"

{sprit-0.1.67.dev0 → sprit-0.1.70.dev0}/setup.py

@@ -7,7 +7,7 @@ setup(
     name="sprit",
     author= "Riley Balikian",
     author_email = "balikian@illinois.edu",
-    version="0.1.67-dev",
+    version="0.1.70-dev",
     package_data={'sprit': ['resources/*', 'resources/icon/*', 'resources/themes/*', 'resources/themes/forest-dark/*', 
                             'resources/themes/forest-light/*', 'resources/sample_data/*','resources/settings/*']},
     long_description_content_type="text/markdown",

{sprit-0.1.67.dev0 → sprit-0.1.70.dev0}/sprit/sprit_hvsr.py

@@ -42,7 +42,7 @@ except: #For testing
     import sprit_gui
     import sprit_jupyter_UI
 
-
+NOWTIME = datetime.datetime.now()
 global spritApp
 
 #Main variables
@@ -123,37 +123,23 @@ class HVSRBatch:
     
     """
     @check_instance
-    def __init__(self, batch_dict, azimuth=None):
+    def __init__(self, batch_dict):
         """HVSR Batch initializer
 
         Parameters
         ----------
         batch_dict : dict
             Dictionary containing Key value pairs with either {sitename:HVSRData object} or {azimuth_angle_degrees:HVSRData object}
-        azimuth : None or numeric, default=None
-            If None, HVSRBatch object will be a batch of sites. If other value, it should be a list of numeric values of the azimuths (in degrees), by default None.
         """
         self._batch_dict = batch_dict
         self.batch_dict = self._batch_dict
         self.batch = True
-        self.batch_type = 'sites'
-        if azimuth is not None:
-            self.batch_type = 'azimuths'
         
-        if self.batch_type=='sites':
-            for sitename, hvsrdata in batch_dict.items():
-                setattr(self, sitename, hvsrdata)
-                self[sitename]['batch']=True  
-            self.sites = list(self._batch_dict.keys())
-            self.azimuths = azimuth # Should be None
-        elif self.batch_type =='azimuths':
-            self.azimuths = azimuth
-            self.sites = []
-            for az, hvsrdata in batch_dict.items():
-                azkey = str(az).zfill(3)
-                setattr(self, azkey, hvsrdata)
-                self[azkey]['batch']=True
-                self.sites.append(hvsrdata['site'])
+        for sitename, hvsrdata in batch_dict.items():
+            setattr(self, sitename, hvsrdata)
+            self[sitename]['batch']=True  
+        self.sites = list(self._batch_dict.keys())
+
 
     #METHODS
     def __to_json(self, filepath):
@@ -909,7 +895,6 @@ def azimuth(hvsr_data, azimuth_angle=10, azimuth_type='multiple', azimuth_unit='
     for key, value in eComp[0].stats.items():
         statsDict[key] = value
     
-
     for i, az_rad in enumerate(azimuth_list):
         az_deg = azimuth_list_deg[i]
         statsDict['channel'] = f"EHR-{str(round(az_deg,0)).zfill(3)}" #Change channel name
@@ -1552,13 +1537,11 @@ def fetch_data(params, source='file', trim_dir=None, export_format='mseed', detr
             params = batch_data_read(input_data=params['datapath'], batch_type='sample', verbose=verbose)
             params = HVSRBatch(params)
             return params
-
         elif source=='dir':
             params['datapath'] = sample_data_dir.joinpath('Batch_SampleData.csv')
             params = batch_data_read(input_data=params['datapath'], batch_type='sample', verbose=verbose)
             params = HVSRBatch(params)
             return params
-
         elif source=='file':
             params['datapath'] = str(params['datapath']).lower()
             
@@ -1642,12 +1625,15 @@ def fetch_data(params, source='file', trim_dir=None, export_format='mseed', detr
                     print(f"\t\tAcquisition Date updated to {params['acq_date']}\n")
 
             # starttime
+            print(params['starttime'])
             today_Starttime = obspy.UTCDateTime(datetime.datetime(year=datetime.date.today().year, month=datetime.date.today().month,
                                                                  day = datetime.date.today().day,
                                                                 hour=0, minute=0, second=0, microsecond=0))
             maxStarttime = datetime.datetime(year=params['acq_date'].year, month=params['acq_date'].month, day=params['acq_date'].day, 
                                              hour=0, minute=0, second=0, microsecond=0, tzinfo=datetime.timezone.utc)
             stime_default = inspect.signature(input_params).parameters['starttime'].default
+            print(stime_default)
+            str(params['starttime']) == str(stime_default)
             if str(params['starttime']) == str(stime_default):
                 for tr in dataIN.merge():
                     currTime = datetime.datetime(year=tr.stats.starttime.year, month=tr.stats.starttime.month, day=tr.stats.starttime.day,
@@ -2599,8 +2585,8 @@ def input_params(datapath,
                 loc='00', 
                 channels=['EHZ', 'EHN', 'EHE'],
                 acq_date=str(datetime.datetime.now().date()),
-                starttime = '00:00:00.00',
-                endtime = '23:59:59.999999',
+                starttime = obspy.UTCDateTime(NOWTIME.year, NOWTIME.month, NOWTIME.day, 0, 0, 0, 0),
+                endtime = obspy.UTCDateTime(NOWTIME.year, NOWTIME.month, NOWTIME.day, 23, 59, 59, 999999),
                 tzone = 'UTC',
                 xcoord = -88.2290526,
                 ycoord =  40.1012122,
@@ -2745,7 +2731,8 @@ def input_params(datapath,
     elif type(starttime) is datetime.time():
         starttime = str(starttime)
     
-    starttime = str(date)+"T"+str(starttime)
+    if not isinstance(starttime, obspy.UTCDateTime):
+        starttime = str(date)+"T"+str(starttime)
     starttime = obspy.UTCDateTime(sprit_utils.format_time(starttime, tzone=tzone))
     
     if type(endtime) is str:
@@ -2758,7 +2745,8 @@ def input_params(datapath,
     elif type(endtime) is datetime.time():
         endtime = str(endtime)
 
-    endtime = str(date)+"T"+str(endtime)
+    if not isinstance(endtime, obspy.UTCDateTime):
+        endtime = str(date)+"T"+str(endtime)
     endtime = obspy.UTCDateTime(sprit_utils.format_time(endtime, tzone=tzone))
 
     acq_date = datetime.date(year=int(date.split('-')[0]), month=int(date.split('-')[1]), day=int(date.split('-')[2]))
@@ -6309,6 +6297,8 @@ def _plot_hvsr(hvsr_data, plot_type, xtype='frequency', fig=None, ax=None, save_
                     yp = min(newCurveList)
                     ax.fill_betweenx(y=[ym, yp], x1=lowf2, x2=hif2, alpha=0.1, color='r')
                 else:
+                    #fpass = float(hvsr_data['BestPeak']['Report']['A(f-)'].replace('Hz', '').replace('-', '').split()[3])
+                    #fpassAmp = float(hvsr_data['BestPeak']['Report']['A(f-)'].replace('Hz', '').replace('-', '').split()[5])
                     ax.fill_between(newFreqList, y1=newCurveList, y2=curveTestList, where=np.array(newCurveList)<=a0_div2, color='g', alpha=0.2)
                     minF = newFreqList[np.argmin(newCurveList)]
                     minA = min(newCurveList)

{sprit-0.1.67.dev0 → sprit-0.1.70.dev0}/sprit/sprit_utils.py

@@ -8,6 +8,7 @@ import warnings
 import zoneinfo
 
 import numpy as np
+from obspy.core.utcdatetime import UTCDateTime
 
 try: # For distribution
     from sprit import sprit_hvsr
@@ -146,7 +147,7 @@ def format_time(inputDT, tzone='UTC'):
         Output datetime.datetime object, now in UTC time.
 
     """
-    if type(inputDT) is str:
+    if isinstance(inputDT, str):
         #tzone = 'America/Chicago'
         #Format string to datetime obj
         div = '-'
@@ -262,9 +263,10 @@ def format_time(inputDT, tzone='UTC'):
 
         outputTimeObj = datetime.datetime(year=int(year),month=int(month), day=int(day),
                                 hour=int(hour), minute=int(minute), second=int(sec), microsecond=int(microS))
-
-    elif type(inputDT) is datetime.datetime or type(inputDT) is datetime.time:
+    elif isinstance(inputDT, (datetime.datetime, datetime.time)):
         outputTimeObj = inputDT
+    elif isinstance(inputDT, UTCDateTime):
+        outputTimeObj = inputDT.datetime
 
     #Add timezone info
     availableTimezones = list(map(str.lower, zoneinfo.available_timezones()))
@@ -284,7 +286,7 @@ def format_time(inputDT, tzone='UTC'):
         raise ValueError("Timezone must be either str or int")
     
     #Convert to UTC
-    outputTimeObj = outputTimeObj.astimezone(datetime.timezone.utc)   
+    outputTimeObj = outputTimeObj.astimezone(datetime.timezone.utc)
 
     return outputTimeObj
 

{sprit-0.1.67.dev0 → sprit-0.1.70.dev0/sprit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sprit
-Version: 0.1.67.dev0
+Version: 0.1.70.dev0
 Summary: A package for processing and analyzing HVSR (Horizontal to Vertical Spectral Ratio) data
 Author: Riley Balikian, Hongyu Xaio
 Author-email: balikian@illinois.edu
@@ -83,18 +83,12 @@ For troubleshooting issues with installation or usage of the sprit package, see
 Aside from the modules in the python standard library, the following package dependencies must be installed in your environment for this package to work
 
 - [Obspy](https://docs.obspy.org/): Python framework for processing seismological data
+- [Matplotlib](https://matplotlib.org/): Comprehensive library for creating static, animated, and interactive visualizations in python
 - [Numpy](https://matplotlib.org/): "The fundamental package for scientific computing with Python"
 - [Scipy](https://scipy.org/): "Fundamental algorithms for scientific computing in Python"
-- [Pandas](https://pandas.pydata.org): "A fast, powerful, flexible and easy to use open source data analysis and manipulation tool"
-- [pyproj](https://pyproj4.github.io/pyproj/stable/): Module for cartographic projections and coordinate transformations, a python interface to [PROJ](https://proj.org/en/9.2/)
-- [Matplotlib](https://matplotlib.org/): Comprehensive library for creating static, animated, and interactive visualizations in python
-- plotly
-
-## Dependencies specifically for GUIs
+- [Pandas](https://pandas.pydata.org): "A fast, powerful, flexible and easy to use open source data analysis and manipulation tool" (Used primarily for exporting and managing results)
 - [pyqt5-sip](https://pypi.org/project/PyQt5): Python binding of Qt GUI toolkit (used for window selection in jupyter notebooks)
-- ipython
-- ipywidgets
-- nbformat 
+- [pyproj](https://pyproj4.github.io/pyproj/stable/): Module for cartographic projections and coordinate transformations, a python interface to [PROJ](https://proj.org/en/9.2/)
 
 # References
 - <a id="1">[1]</a> <http://sesame.geopsy.org/Delivrables/SESAME-Finalreport_april05.pdf>