sprit 0.1.72.dev0__tar.gz → 0.1.77.dev0__tar.gz

{sprit-0.1.72.dev0/sprit.egg-info → sprit-0.1.77.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sprit
-Version: 0.1.72.dev0
+Version: 0.1.77.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

{sprit-0.1.72.dev0 → sprit-0.1.77.dev0}/pyproject.toml

@@ -7,7 +7,7 @@ name = "sprit"
 authors = [{name="Riley Balikian"}, {name="Hongyu Xaio"}]
 dynamic = ["readme"]
 license = {file = "LICENSE"}
-version="0.1.72-dev"
+version="0.1.77-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.72.dev0 → sprit-0.1.77.dev0}/setup.py

@@ -7,7 +7,7 @@ setup(
     name="sprit",
     author= "Riley Balikian",
     author_email = "balikian@illinois.edu",
-    version="0.1.72-dev",
+    version="0.1.77-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.77.dev0/sprit/resources/settings/gui_theme.json

@@ -0,0 +1 @@
+{"theme_name": "forest-dark"}

{sprit-0.1.72.dev0 → sprit-0.1.77.dev0}/sprit/sprit_cli.py

@@ -41,6 +41,7 @@ def main():
                      sprit.remove_noise,
                      sprit.generate_ppsds,
                      sprit.process_hvsr,
+                     sprit.remove_outlier_curves,
                      sprit.check_peaks,
                      sprit.get_report,
                      sprit.plot_hvsr]

{sprit-0.1.72.dev0 → sprit-0.1.77.dev0}/sprit/sprit_gui.py

@@ -36,6 +36,7 @@ except: #For local testing
 
 global spritApp
 global current_theme_name
+global SPRIT_App
 
 resource_dir = pathlib.Path(pkg_resources.resource_filename(__name__, 'resources/'))
 settings_dir = resource_dir.joinpath('settings')
@@ -44,109 +45,6 @@ with open(gui_theme_file, 'r') as f:
     curr_gui_dict = json.load(f)
 current_theme_name = curr_gui_dict['theme_name']
 
-#Decorator that catches errors and warnings (to be modified later for gui)
-def catch_errors(func):
-    #Define a local function to get a list of warnings that we'll use in the output
-    def get_warning_msg_list(w):
-        messageList = []
-        #Collect warnings that happened before we got to the error
-        if w:
-            hasWarnings = True
-            for wi in w:
-                warning_category = type(wi.message).__name__.title().replace('warning','Warning')
-                #if w.line is None:
-                #    w.line = linecache.getline(wi.filename, wi.lineno)
-                warning_lineNo = wi.lineno
-                warning_message = str(wi.message)
-                # append the warning category and message to messageList so we get all warnings
-                messageList.append(f'{warning_category} ({warning_lineNo}): {warning_message}')
-        return messageList
-    
-    # use functools.wraps to preserve the original function's metadata
-    @functools.wraps(func)
-    def wrapper(*args, **kwargs):
-        result = None
-        # use the global keyword to access the error_message and error_category variables
-        global error_message
-        global error_category
-
-        messageList = []
-        hasWarnings = False
-        # use a try-except block to catch any exceptions
-        #result = func(*args, **kwargs)
-        try:
-            # use a context manager to catch any warnings
-            with warnings.catch_warnings(record=True) as w:
-                warnings.simplefilter('always')
-                # call the original function with the given arguments
-                result = func(*args, **kwargs)
-                
-                #Get message list, [] if no messages, doesn't run at all if Error/exception in func
-                messageList = get_warning_msg_list(w)
-                if messageList == []:
-                    return result
-                else:
-                    warningMessage = "WARNING:"
-                    for msg in messageList:
-                        warningMessage = "\n {}".format(msg)
-
-                    messagebox.showwarning(title='WARNINGS', message=warningMessage)
-                    
-        except Exception as e:
-            messageList = get_warning_msg_list(w)
-            errorObj = sys.exc_info()[2]
-
-            mainErrText = sys.exc_info()[1]
-
-            mainErrTb = traceback.extract_tb(sys.exc_info()[2])[-1]
-            mainErrFilePath = pathlib.Path(mainErrTb[0])
-            
-            mainErrFileName = mainErrFilePath.stem
-            mainErrLineNo = mainErrTb[1]
-            mainErrFunc = mainErrTb[2]
-            mainErrCodeLine = mainErrTb[3]
-
-            errLineNo1 = str(traceback.extract_tb(sys.exc_info()[2])[-1].lineno)
-            error_category = type(e).__name__.title().replace('error', 'Error')
-            error_message = f"{e} ({errLineNo1})"
-            
-            #Get message list, [] if no messages, doesn't run at all if Error/exception in func
-            warningMessageList = get_warning_msg_list(w)
-
-            #Build error messages
-            tbTuple0 = sys.exc_info()[0]
-            tbTuple1 = sys.exc_info()[1]
-            tbTuple2 = traceback.extract_tb(sys.exc_info()[2])
-            
-            logMsg = f"**ERROR**\n{tbTuple0.__name__}: {tbTuple1}"
-            dialogErrMsg = logMsg.split(':')[1]
-            for tb in tbTuple2:
-                logMsg = logMsg + '\n\t'
-                logMsg = logMsg + f"{pathlib.Path(tb[0]).stem}.{tb[2]}(): {tb[3]} (Line {tb[1]})"
-                dialogErrMsg = dialogErrMsg + f"\n{pathlib.Path(tb[0]).stem}.{tb[2]}(), Line {tb[1]}"
-            logMsg = logMsg + '\n\n'
-
-            #fullErrorMessage = f'ERROR {mainErrFileName}.{mainErrFunc} ({mainErrLineNo}): {mainErrText} \n\n {mainErrFileName} Line {mainErrLineNo}: {mainErrCodeLine}.'
-            if messageList == []:
-                pass
-            else:
-                dialogErrMsg = dialogErrMsg+"\n\n  Additional Warnings along the way. See Log for more information."
-                logMsg = logMsg + "\n\n\t  *WARNING(S)*\n\tAdditional Warnings along the way:"
-                for addMsg in warningMessageList:
-                    logMsg = logMsg+"\n\t\t{}".format(addMsg)
-
-
-            SPRIT_App.log_errorMsg(spritApp, logMsg)
-
-            messagebox.showerror(title=f'ERROR ({error_category})',
-                                    message=dialogErrMsg)
-            update_progress_bars(100)
-
-        # return the result of the function or the error/warning messages and categories
-        return result
-    # return the wrapper function
-    return wrapper
-
 class SPRIT_App:
     global spritApp
     def __init__(self, master):
@@ -493,51 +391,51 @@ class SPRIT_App:
                 self.tab_control.select(self.preview_data_tab)
             return self.hvsr_data
         
-        def report_results(hvsr_results):
-            self.curveTest1ResultText.configure(text=hvsr_results['BestPeak']['Report']['Lw'][:-1])
-            self.curveTest1Result.configure(text=hvsr_results['BestPeak']['Report']['Lw'][-1])
+        def report_results(hvsr_results, azimuth='HV'):
+            self.curveTest1ResultText.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['Lw'][:-1])
+            self.curveTest1Result.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['Lw'][-1])
 
-            self.curveTest2ResultText.configure(text=hvsr_results['BestPeak']['Report']['Nc'][:-1])
-            self.curveTest2Result.configure(text=hvsr_results['BestPeak']['Report']['Nc'][-1])
+            self.curveTest2ResultText.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['Nc'][:-1])
+            self.curveTest2Result.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['Nc'][-1])
 
-            self.curveTest3ResultText.configure(text=hvsr_results['BestPeak']['Report']['σ_A(f)'][:-1])
-            self.curveTest3Result.configure(text=hvsr_results['BestPeak']['Report']['σ_A(f)'][-1])
+            self.curveTest3ResultText.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['σ_A(f)'][:-1])
+            self.curveTest3Result.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['σ_A(f)'][-1])
 
-            curvePass = (hvsr_results['BestPeak']['PassList']['WindowLengthFreq.'] +
-                                hvsr_results['BestPeak']['PassList']['SignificantCycles']+
-                                hvsr_results['BestPeak']['PassList']['LowCurveStDevOverTime']) > 2
+            curvePass = (hvsr_results['BestPeak'][azimuth]['PassList']['WindowLengthFreq.'] +
+                                hvsr_results['BestPeak'][azimuth]['PassList']['SignificantCycles']+
+                                hvsr_results['BestPeak'][azimuth]['PassList']['LowCurveStDevOverTime']) > 2
             if curvePass:
                 self.totalCurveResult.configure(text=sprit_utils.check_mark(), font=("TkDefaultFont", 16, "bold"), foreground='green')
             else:
                 self.totalCurveResult.configure(text=sprit_utils.x_mark(), font=("TkDefaultFont", 16, "bold"), foreground='red')
 
-            self.peakTest1ResultText.configure(text=hvsr_results['BestPeak']['Report']['A(f-)'][:-1])
-            self.peakTest1Result.configure(text=hvsr_results['BestPeak']['Report']['A(f-)'][-1])
+            self.peakTest1ResultText.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['A(f-)'][:-1])
+            self.peakTest1Result.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['A(f-)'][-1])
             
-            self.peakTest2ResultText.configure(text=hvsr_results['BestPeak']['Report']['A(f+)'][:-1])
-            self.peakTest2Result.configure(text=hvsr_results['BestPeak']['Report']['A(f+)'][-1])
+            self.peakTest2ResultText.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['A(f+)'][:-1])
+            self.peakTest2Result.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['A(f+)'][-1])
             
-            self.peakTest3ResultText.configure(text=hvsr_results['BestPeak']['Report']['A0'][:-1])
-            self.peakTest3Result.configure(text=hvsr_results['BestPeak']['Report']['A0'][-1])
+            self.peakTest3ResultText.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['A0'][:-1])
+            self.peakTest3Result.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['A0'][-1])
 
-            self.peakTest4ResultText.configure(text=hvsr_results['BestPeak']['Report']['P-'][:5] + ' and ' +hvsr_results['BestPeak']['Report']['P+'][:-1])
-            if hvsr_results['BestPeak']['PassList']['FreqStability']:
+            self.peakTest4ResultText.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['P-'][:5] + ' and ' +hvsr_results['BestPeak'][azimuth]['Report']['P+'][:-1])
+            if hvsr_results['BestPeak'][azimuth]['PassList']['FreqStability']:
                 self.peakTest4Result.configure(text=sprit_utils.check_mark())
             else:
                 self.peakTest4Result.configure(text=sprit_utils.x_mark())
 
-            self.peakTest5ResultText.configure(text=hvsr_results['BestPeak']['Report']['Sf'][:-1])
-            self.peakTest5Result.configure(text=hvsr_results['BestPeak']['Report']['Sf'][-1])
+            self.peakTest5ResultText.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['Sf'][:-1])
+            self.peakTest5Result.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['Sf'][-1])
             
-            self.peakTest6ResultText.configure(text=hvsr_results['BestPeak']['Report']['Sa'][:-1])
-            self.peakTest6Result.configure(text=hvsr_results['BestPeak']['Report']['Sa'][-1])
-
-            peakPass = (hvsr_results['BestPeak']['PassList']['PeakProminenceBelow'] +
-                    hvsr_results['BestPeak']['PassList']['PeakProminenceAbove']+
-                    hvsr_results['BestPeak']['PassList']['PeakAmpClarity']+
-                    hvsr_results['BestPeak']['PassList']['FreqStability']+
-                    hvsr_results['BestPeak']['PassList']['PeakStability_FreqStD']+
-                    hvsr_results['BestPeak']['PassList']['PeakStability_AmpStD']) >= 5
+            self.peakTest6ResultText.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['Sa'][:-1])
+            self.peakTest6Result.configure(text=hvsr_results['BestPeak'][azimuth]['Report']['Sa'][-1])
+
+            peakPass = (hvsr_results['BestPeak'][azimuth]['PassList']['PeakProminenceBelow'] +
+                    hvsr_results['BestPeak'][azimuth]['PassList']['PeakProminenceAbove']+
+                    hvsr_results['BestPeak'][azimuth]['PassList']['PeakAmpClarity']+
+                    hvsr_results['BestPeak'][azimuth]['PassList']['FreqStability']+
+                    hvsr_results['BestPeak'][azimuth]['PassList']['PeakStability_FreqStD']+
+                    hvsr_results['BestPeak'][azimuth]['PassList']['PeakStability_AmpStD']) >= 5
             if peakPass:
                 self.totalPeakResult.configure(text=sprit_utils.check_mark(), font=("TkDefaultFont", 16, "bold"), foreground='green')
             else:
@@ -598,7 +496,7 @@ class SPRIT_App:
                                             rmse_thresh=98,
                                             use_percentile=True,
                                             use_hv_curve = False,
-                                            show_plot = False)
+                                            show_outlier_plot = False)
             update_progress_bars(prog_percent=60)
 
             self.log_text.insert('end', f"{self.procHVSR_call['text']}\n\n")
@@ -3085,6 +2983,113 @@ class SPRIT_App:
         # Pack tab control
         self.tab_control.pack(expand=True, fill="both")
 
+
+#Decorator that catches errors and warnings (to be modified later for gui)
+def catch_errors(func):
+    global spritApp
+
+    #Define a local function to get a list of warnings that we'll use in the output
+    def get_warning_msg_list(w):
+        messageList = []
+        #Collect warnings that happened before we got to the error
+        if w:
+            hasWarnings = True
+            for wi in w:
+                warning_category = type(wi.message).__name__.title().replace('warning','Warning')
+                #if w.line is None:
+                #    w.line = linecache.getline(wi.filename, wi.lineno)
+                warning_lineNo = wi.lineno
+                warning_message = str(wi.message)
+                # append the warning category and message to messageList so we get all warnings
+                messageList.append(f'{warning_category} ({warning_lineNo}): {warning_message}')
+        return messageList
+    
+    # use functools.wraps to preserve the original function's metadata
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        result = None
+        # use the global keyword to access the error_message and error_category variables
+        global error_message
+        global error_category
+        global spritApp
+
+        messageList = []
+        hasWarnings = False
+        # use a try-except block to catch any exceptions
+        #result = func(*args, **kwargs)
+        try:
+            # use a context manager to catch any warnings
+            with warnings.catch_warnings(record=True) as w:
+                warnings.simplefilter('always')
+                # call the original function with the given arguments
+                result = func(*args, **kwargs)
+                
+                #Get message list, [] if no messages, doesn't run at all if Error/exception in func
+                messageList = get_warning_msg_list(w)
+                if messageList == []:
+                    return result
+                else:
+                    warningMessage = "WARNING:"
+                    for msg in messageList:
+                        warningMessage = "\n {}".format(msg)
+
+                    messagebox.showwarning(title='WARNINGS', message=warningMessage)
+                    
+        except Exception as e:
+            messageList = get_warning_msg_list(w)
+            errorObj = sys.exc_info()[2]
+
+            mainErrText = sys.exc_info()[1]
+
+            mainErrTb = traceback.extract_tb(sys.exc_info()[2])[-1]
+            mainErrFilePath = pathlib.Path(mainErrTb[0])
+            
+            mainErrFileName = mainErrFilePath.stem
+            mainErrLineNo = mainErrTb[1]
+            mainErrFunc = mainErrTb[2]
+            mainErrCodeLine = mainErrTb[3]
+
+            errLineNo1 = str(traceback.extract_tb(sys.exc_info()[2])[-1].lineno)
+            error_category = type(e).__name__.title().replace('error', 'Error')
+            error_message = f"{e} ({errLineNo1})"
+            
+            #Get message list, [] if no messages, doesn't run at all if Error/exception in func
+            warningMessageList = get_warning_msg_list(w)
+
+            #Build error messages
+            tbTuple0 = sys.exc_info()[0]
+            tbTuple1 = sys.exc_info()[1]
+            tbTuple2 = traceback.extract_tb(sys.exc_info()[2])
+            
+            logMsg = f"**ERROR**\n{tbTuple0.__name__}: {tbTuple1}"
+            dialogErrMsg = logMsg.split(':')[1]
+            for tb in tbTuple2:
+                logMsg = logMsg + '\n\t'
+                logMsg = logMsg + f"{pathlib.Path(tb[0]).stem}.{tb[2]}(): {tb[3]} (Line {tb[1]})"
+                dialogErrMsg = dialogErrMsg + f"\n{pathlib.Path(tb[0]).stem}.{tb[2]}(), Line {tb[1]}"
+            logMsg = logMsg + '\n\n'
+
+            #fullErrorMessage = f'ERROR {mainErrFileName}.{mainErrFunc} ({mainErrLineNo}): {mainErrText} \n\n {mainErrFileName} Line {mainErrLineNo}: {mainErrCodeLine}.'
+            if messageList == []:
+                pass
+            else:
+                dialogErrMsg = dialogErrMsg+"\n\n  Additional Warnings along the way. See Log for more information."
+                logMsg = logMsg + "\n\n\t  *WARNING(S)*\n\tAdditional Warnings along the way:"
+                for addMsg in warningMessageList:
+                    logMsg = logMsg+"\n\t\t{}".format(addMsg)
+
+
+            SPRIT_App.log_errorMsg(spritApp, logMsg)
+
+            messagebox.showerror(title=f'ERROR ({error_category})',
+                                    message=dialogErrMsg)
+            update_progress_bars(100)
+
+        # return the result of the function or the error/warning messages and categories
+        return result
+    # return the wrapper function
+    return wrapper
+
 def on_closing():
     plt.close('all')
     root.destroy()

{sprit-0.1.72.dev0 → sprit-0.1.77.dev0}/sprit/sprit_hvsr.py

@@ -1159,7 +1159,6 @@ def check_peaks(hvsr_data, hvsr_band=[0.4, 40], peak_selection='max', peak_freq_
             if not hvsr_band:
                 hvsr_band = [0.4, 40]
             
-            print('hvsr_band again', hvsr_band)
             hvsr_data['hvsr_band'] = hvsr_band
 
             anyK = list(hvsr_data['x_freqs'].keys())[0]
@@ -3840,7 +3839,7 @@ def process_hvsr(hvsr_data, method=3, smooth=True, freq_smooth='konno ohmachi',
         hvsr_out['ind_hvsr_peak_indices'] = {}
         #hvsr_out['hvsr_windows_df']['CurvesPeakFreqs'] = {}
         for col_name in hvsr_out['hvsr_windows_df'].columns:
-            if "HV_Curves" in col_name:
+            if col_name.startswith("HV_Curves"):
                 tStepPeaks = []
                 if len(col_name.split('_')) > 2:
                     colSuffix = "_"+'_'.join(col_name.split('_')[2:])
@@ -6769,7 +6768,7 @@ def __gethvsrparams(hvsr_out):
         hvsrm2 = {}
         hvsr_log_std = {}
         for col_name in hvsr_out['hvsr_windows_df'].columns:
-            if "HV_Curves" in col_name:
+            if col_name.startswith("HV_Curves"):
                 if col_name == 'HV_Curves':
                     colSuffix = '_HV'
                     colID = 'HV'
@@ -6782,8 +6781,8 @@ def __gethvsrparams(hvsr_out):
                 for i, r in enumerate(logStackedata):
                     logStackedata[i] = np.array(r)
 
-                hvsr_out['hvsr_windows_df']['HV_Curves_Log10'+colSuffix] = logStackedata
-                hvsr_log_std[colID] = np.nanstd(np.stack(hvsr_out['hvsr_windows_df']['HV_Curves_Log10'+colSuffix][hvsrDF['Use']]), axis=0)
+                hvsr_out['hvsr_windows_df']['Log10_HV_Curves'+colSuffix] = logStackedata
+                hvsr_log_std[colID] = np.nanstd(np.stack(hvsr_out['hvsr_windows_df']['Log10_HV_Curves'+colSuffix][hvsrDF['Use']]), axis=0)
 
                 #The components are already calculated, don't need to recalculate aren't calculated at the time-step level
                 hvsrp[colID] = np.add(hvsr_out['hvsr_curve'], hvsr_out['ind_hvsr_stdDev'][colID])

{sprit-0.1.72.dev0 → sprit-0.1.77.dev0}/sprit/sprit_jupyter_UI.py

@@ -932,24 +932,29 @@ def create_jupyter_ui():
 
         return plot_list_list
 
-    def parse_hv_plot_list(hv_data, hvsr_plot_list):
+    def parse_hv_plot_list(hv_data, hvsr_plot_list, azimuth='HV'):
         hvsr_data = hv_data
         x_data = hvsr_data.x_freqs['Z']
         hvsrDF = hvsr_data.hvsr_windows_df
+        if azimuth == 'HV':
+            HVCol = 'HV_Curves'
+        else:
+            HVCol = 'HV_Curves_'+azimuth
 
         if 'tp' in hvsr_plot_list:
             allpeaks = []
-            for row in hvsrDF[hvsrDF['Use']]['CurvesPeakFreqs'].values:
+            for row in hvsrDF[hvsrDF['Use']]['CurvesPeakFreqs_'+azimuth].values:
                 for peak in row:
                     allpeaks.append(peak)
             allInd = []
-            for row, peakList in enumerate(hvsrDF[hvsrDF['Use']]['CurvesPeakIndices'].values):
+            for row, peakList in enumerate(hvsrDF[hvsrDF['Use']]['CurvesPeakIndices_'+azimuth].values):
                 for ind in peakList:
                     allInd.append((row, ind))
             x_vals = []
             y_vals = []
-            y_max = np.nanmax(hvsr_data.hvsrp)
-            hvCurveInd = list(hvsrDF.columns).index('HV_Curves')
+            y_max = np.nanmax(hvsr_data.hvsrp[azimuth])
+            hvCurveInd = list(hvsrDF.columns).index(HVCol)
+
             for i, tp in enumerate(allpeaks):
                 x_vals.extend([tp, tp, None]) # add two x values and a None
                 y_vals.extend([0, hvsrDF.iloc[allInd[i][0], hvCurveInd][allInd[i][1]], None]) # add the first and last y values and a None            
@@ -961,7 +966,7 @@ def create_jupyter_ui():
                                             row=1, col=1)
 
         if 't' in hvsr_plot_list:
-            alltimecurves = np.stack(hvsrDF[hvsrDF['Use']]['HV_Curves'])
+            alltimecurves = np.stack(hvsrDF[hvsrDF['Use']][HVCol])
             for i, row in enumerate(alltimecurves):
                 if i==0:
                     showLeg = True
@@ -970,13 +975,13 @@ def create_jupyter_ui():
                 results_fig.add_trace(go.Scatter(x=x_data[:-1], y=row, mode='lines',
                                             line=dict(width=0.5, dash="solid", 
                                             color="rgba(100, 110, 100, 0.8)"), 
-                                            showlegend=showLeg, 
+                                            showlegend=showLeg,
                                             name='Ind. time win. curve', 
                                             hoverinfo='none'),
                                             row=1, col=1)
 
         if 'all' in hvsr_plot_list:
-            for i, p in enumerate(hvsr_data['hvsr_peak_freqs']):
+            for i, p in enumerate(hvsr_data['hvsr_peak_freqs'][azimuth]):
                 if i==0:
                     showLeg = True
                 else:
@@ -984,7 +989,7 @@ def create_jupyter_ui():
 
                 results_fig.add_trace(go.Scatter(
                     x=[p, p, None], # set x to None
-                    y=[0, np.nanmax(np.stack(hvsrDF['HV_Curves'])),None], # set y to None
+                    y=[0, np.nanmax(np.stack(hvsrDF[HVCol])),None], # set y to None
                     mode="lines", # set mode to lines
                     line=dict(width=1, dash="dot", color="gray"), # set line properties
                     name="All checked peaks", # set legend name
@@ -993,13 +998,13 @@ def create_jupyter_ui():
 
         if '-s' not in hvsr_plot_list:
             # Show standard deviation
-            results_fig.add_trace(go.Scatter(x=x_data, y=hvsr_data.hvsrp2,
+            results_fig.add_trace(go.Scatter(x=x_data, y=hvsr_data.hvsrp2[azimuth],
                                     line={'color':'black', 'width':0.1},marker=None, 
                                     showlegend=False, name='Log. St.Dev. Upper',
                                     hoverinfo='none'),
                                     row=1, col=1)
             
-            results_fig.add_trace(go.Scatter(x=x_data, y=hvsr_data.hvsrm2,
+            results_fig.add_trace(go.Scatter(x=x_data, y=hvsr_data.hvsrm2[azimuth],
                                     line={'color':'black', 'width':0.1},marker=None,
                                     fill='tonexty', fillcolor="rgba(128, 128, 128, 0.6)",
                                     name='Log. St.Dev.', hoverinfo='none'),
@@ -1007,7 +1012,7 @@ def create_jupyter_ui():
                 
         if 'p' in hvsr_plot_list:
             results_fig.add_trace(go.Scatter(
-                x=[hvsr_data['BestPeak']['f0'], hvsr_data['BestPeak']['f0'], None], # set x to None
+                x=[hvsr_data['BestPeak'][azimuth]['f0'], hvsr_data['BestPeak'][azimuth]['f0'], None], # set x to None
                 y=[0,np.nanmax(np.stack(hvsrDF['HV_Curves'])),None], # set y to None
                 mode="lines", # set mode to lines
                 line=dict(width=1, dash="dash", color="black"), # set line properties
@@ -1016,15 +1021,15 @@ def create_jupyter_ui():
 
         if 'ann' in hvsr_plot_list:
             # Annotate best peak
-            results_fig.add_annotation(x=np.log10(hvsr_data['BestPeak']['f0']),
+            results_fig.add_annotation(x=np.log10(hvsr_data['BestPeak'][azimuth]['f0']),
                                     y=0, yanchor='bottom', xanchor='center',
-                                    text=f"{hvsr_data['BestPeak']['f0']:.3f} Hz",
+                                    text=f"{hvsr_data['BestPeak'][azimuth]['f0']:.3f} Hz",
                                     bgcolor='rgba(255, 255, 255, 0.7)',
                                     showarrow=False,
                                     row=1, col=1)
         return results_fig
 
-    def parse_comp_plot_list(hv_data, comp_plot_list):
+    def parse_comp_plot_list(hv_data, comp_plot_list, azimuth='HV'):
         
         hvsr_data = hv_data
         # Initial setup
@@ -1043,12 +1048,13 @@ def create_jupyter_ui():
 
         alpha = 0.4 * transparency_modifier
         components = ['Z', 'E', 'N']
+
         compColor_semi_light = {'Z':f'rgba(128,128,128,{alpha})',
                     'E':f'rgba(0,0,128,{alpha})',
                     'N':f'rgba(128,0,0,{alpha})'}
 
         alpha = 0.7 * transparency_modifier
-        compColor_semi = {'Z':f'rgba(128,128,128,{alpha})', 
+        compColor_semi = {'Z':f'rgba(128,128,128,{alpha})',
                         'E':f'rgba(100,100,128,{alpha})', 
                         'N':f'rgba(128,100,100,{alpha})'}
 
@@ -1056,6 +1062,12 @@ def create_jupyter_ui():
                     'E':f'rgba(100,100,250,{alpha})', 
                     'N':f'rgba(250,100,100,{alpha})'}
 
+        for az in hvsr_data.hvsr_az.keys():
+            components.append(az)
+            compColor_semi_light[az] = f'rgba(0,128,0,{alpha})'
+            compColor_semi[az] = f'rgba(100,128,100,{alpha})'
+            compColor[az] = f'rgba(100,250,100,{alpha})'
+
         # Whether to plot in new subplot or not
         if  comp_plot_list != [] and '+' in comp_plot_list[0]:
             compRow=2
@@ -1114,7 +1126,7 @@ def create_jupyter_ui():
                     maxVal = np.nanmax(currPPSDCurve)
 
             results_fig.add_trace(go.Scatter(
-                x=[hvsr_data['BestPeak']['f0'], hvsr_data['BestPeak']['f0'], None], # set x to None
+                x=[hvsr_data['BestPeak'][azimuth]['f0'], hvsr_data['BestPeak'][azimuth]['f0'], None], # set x to None
                 y=[minVal,maxVal,None], # set y to None
                 mode="lines", # set mode to lines
                 line=dict(width=1, dash="dash", color="black"), # set line properties
@@ -1130,9 +1142,9 @@ def create_jupyter_ui():
                 currPPSDCurve = hvsr_data['psd_values_tavg'][comp]
                 if np.nanmin(currPPSDCurve) < minVal:
                     minVal = np.nanmin(currPPSDCurve)
-            results_fig.add_annotation(x=np.log10(hvsr_data['BestPeak']['f0']),
+            results_fig.add_annotation(x=np.log10(hvsr_data['BestPeak'][azimuth]['f0']),
                             y=minVal,
-                            text=f"{hvsr_data['BestPeak']['f0']:.3f} Hz",
+                            text=f"{hvsr_data['BestPeak'][azimuth]['f0']:.3f} Hz",
                             bgcolor='rgba(255, 255, 255, 0.7)',
                             showarrow=False,
                             yref=yaxis_to_use,
@@ -1157,13 +1169,18 @@ def create_jupyter_ui():
                             row=compRow, col=1)
         return results_fig
 
-    def parse_spec_plot_list(hv_data, spec_plot_list, subplot_num):
+    def parse_spec_plot_list(hv_data, spec_plot_list, subplot_num, azimuth='HV'):
         hvsr_data = hv_data
+        if azimuth == 'HV':
+            HVCol = 'HV_Curves'
+        else:
+            HVCol = 'HV_Curves_'+azimuth
+
         # Initial setup
         hvsrDF = hvsr_data.hvsr_windows_df
         specAxisTimes = np.array([dt.isoformat() for dt in hvsrDF.index.to_pydatetime()])
         y_data = hvsr_data.x_freqs['Z'][1:]
-        image_data = np.stack(hvsrDF['HV_Curves']).T
+        image_data = np.stack(hvsrDF[HVCol]).T
 
         maxZ = np.percentile(image_data, 100)
         minZ = np.percentile(image_data, 0)
@@ -1195,7 +1212,7 @@ def create_jupyter_ui():
         # tp currently is not being added to spec_plot_list
         if 'tp' in spec_plot_list:
             yvals = []
-            for row in hvsrDF['HV_Curves'].values:
+            for row in hvsrDF[HVCol].values:
                 maxInd = np.argmax(row)
                 yvals.append(y_data[maxInd])
             tp_trace = go.Scatter(x=specAxisTimes, y=yvals, mode='markers',
@@ -1203,12 +1220,12 @@ def create_jupyter_ui():
             results_fig.add_trace(tp_trace, row=subplot_num, col='all')
 
         if 'p' in spec_plot_list:
-            results_fig.add_hline(y=hvsr_data['BestPeak']['f0'], line_width=1, line_dash='dash', line_color='black', row=subplot_num, col='all')
+            results_fig.add_hline(y=hvsr_data['BestPeak'][azimuth]['f0'], line_width=1, line_dash='dash', line_color='black', row=subplot_num, col='all')
 
         if 'ann' in spec_plot_list:
             results_fig.add_annotation(x=specAxisTimes[-1],
                                     y=hvsr_data['hvsr_band'][1],
-                                    text=f"Peak: {hvsr_data['BestPeak']['f0']:.3f} Hz",
+                                    text=f"Peak: {hvsr_data['BestPeak'][azimuth]['f0']:.3f} Hz",
                                     bgcolor='rgba(255, 255, 255, 0.7)',
                                     showarrow=False, xanchor='right', yanchor='top',
                                     row=subplot_num, col='all')
@@ -1221,7 +1238,7 @@ def create_jupyter_ui():
                         row=subplot_num, col=1)
 
         results_fig.add_annotation(
-            text=f"{hvsrDF['Use'].sum()}/{hvsrDF.shape[0]} windows used",
+            text=f"{hvsrDF['Use'].astype(bool).sum()}/{hvsrDF.shape[0]} windows used",
             x=max(specAxisTimes),
             y=np.log10(min(y_data))+(np.log10(max(y_data))-np.log10(min(y_data)))*0.01,
             xanchor="right", yanchor="bottom",bgcolor='rgba(256,256,256,0.7)',

{sprit-0.1.72.dev0 → sprit-0.1.77.dev0/sprit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sprit
-Version: 0.1.72.dev0
+Version: 0.1.77.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

sprit-0.1.72.dev0/sprit/resources/settings/gui_theme.json

@@ -1 +0,0 @@
-{"theme_name": "default"}