pyadps 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

pyadps/pages/03_Download_Raw_File.py

@@ -34,7 +34,7 @@ if "add_attributes_DRW" not in st.session_state:
 
 if "file_prefix" not in st.session_state:
     raw_basename = os.path.basename(st.session_state.fname)
-    st.session_state.filename = os.path.splitext(raw_basename)[0] 
+    st.session_state.filename = os.path.splitext(raw_basename)[0]
     st.session_state.file_prefix = st.session_state.filename
 
 
@@ -45,7 +45,6 @@ if "filename" not in st.session_state:
     st.session_state.filename = ""  # <-- Default file name if not passed
 
 
-
 ################ Functions #######################
 @st.cache_data()
 def file_access(uploaded_file):
@@ -63,6 +62,7 @@ def read_file(filepath):
         ds.fixensemble()
     st.session_state.ds = ds
 
+
 @st.cache_data
 def get_prefixed_filename(base_name):
     """Generates the file name with the optional prefix."""
@@ -74,57 +74,55 @@ def get_prefixed_filename(base_name):
 @st.cache_data
 def file_write(path, axis_option, add_attributes=True):
     tempdirname = tempfile.TemporaryDirectory(delete=False)
-    st.session_state.rawfilename = os.path.join(tempdirname.name, get_prefixed_filename("RAW_DAT.nc"))
+    st.session_state.rawfilename = os.path.join(
+        tempdirname.name, get_prefixed_filename("RAW_DAT.nc")
+    )
 
     if add_attributes:
         wr.rawnc(
             path,
             st.session_state.rawfilename,
-            st.session_state.date1,
-            axis_option,
+            axis_option=axis_option,
             attributes=st.session_state.attributes,
         )
     else:
-        wr.rawnc(
-            path, st.session_state.rawfilename, st.session_state.date1, axis_option
-        )
+        wr.rawnc(path, st.session_state.rawfilename, axis_option)
+
 
 @st.cache_data
 def file_write_flead(path, axis_option, add_attributes=True):
     tempvardirname = tempfile.TemporaryDirectory(delete=False)
-    st.session_state.fleadfilename = os.path.join(tempvardirname.name, get_prefixed_filename("RAW_FIX.nc"))
+    st.session_state.fleadfilename = os.path.join(
+        tempvardirname.name, get_prefixed_filename("RAW_FIX.nc")
+    )
 
     if add_attributes:
         wr.flead_nc(
             path,
             st.session_state.fleadfilename,
-            st.session_state.date2,
-            axis_option,
+            axis_option=axis_option,
             attributes=st.session_state.attributes,
         )
     else:
-        wr.flead_nc(
-            path, st.session_state.fleadfilename, st.session_state.date2, axis_option
-        )
+        wr.flead_nc(path, st.session_state.fleadfilename, axis_option)
+
 
 @st.cache_data
 def file_write_vlead(path, axis_option, add_attributes=True):
     tempvardirname = tempfile.TemporaryDirectory(delete=False)
-    st.session_state.vleadfilename = os.path.join(tempvardirname.name, get_prefixed_filename("RAW_VAR.nc"))
+    st.session_state.vleadfilename = os.path.join(
+        tempvardirname.name, get_prefixed_filename("RAW_VAR.nc")
+    )
 
     if add_attributes:
         wr.vlead_nc(
             path,
             st.session_state.vleadfilename,
-            st.session_state.date3,
-            axis_option,
+            axis_option=axis_option,
             attributes=st.session_state.attributes,
         )
     else:
-        wr.vlead_nc(
-            path, st.session_state.vleadfilename, st.session_state.date3, axis_option
-        )
-
+        wr.vlead_nc(path, st.session_state.vleadfilename, axis_option)
 
 
 if "axis_option" not in st.session_state:

pyadps/pages/05_QC_Test.py

@@ -92,11 +92,12 @@ def qc_submit():
     evt = st.session_state.evt_QCT
     ft = st.session_state.ft_QCT
     is3beam = st.session_state.is3beam_QCT
+    beam_ignore = st.session_state.beam_to_ignore
     mask = pg_check(ds, mask, pgt, threebeam=is3beam)
-    mask = correlation_check(ds, mask, ct)
-    mask = echo_check(ds, mask, et)
+    mask = correlation_check(ds, mask, ct,is3beam,beam_ignore=beam_ignore)
+    mask = echo_check(ds, mask, et,is3beam,beam_ignore=beam_ignore)
     mask = ev_check(ds, mask, evt)
-    mask = false_target(ds, mask, ft, threebeam=True)
+    mask = false_target(ds, mask, ft, threebeam=is3beam, beam_ignore=beam_ignore)
     # Store the processed mask in a temporary mask
     st.session_state.qc_mask_temp = mask
 
@@ -337,6 +338,22 @@ with tab2:
             "Would you like to use a three-beam solution?", (True, False)
         )
 
+        if st.session_state.is3beam_QCT:
+            beam_label_to_value = {
+                "None": None,
+                "Beam 1": 0,
+                "Beam 2": 1,
+                "Beam 3": 2,
+                "Beam 4": 3
+            }
+
+            selected_beam = st.selectbox(
+                "Select Beam to Ignore",
+                options=list(beam_label_to_value.keys()),
+                index=0  # Default is "None"
+            )
+            st.session_state.beam_to_ignore =  beam_label_to_value[selected_beam]
+
         st.session_state.pgt_QCT = st.number_input(
             "Select Percent Good Threshold",
             0,

pyadps/pages/08_Write_File.py

@@ -1,6 +1,6 @@
 import configparser
 import tempfile
-
+import os
 import numpy as np
 import pandas as pd
 import plotly.graph_objects as go
@@ -506,6 +506,8 @@ if generate_config_radio == "Yes":
     config["QCTest"]["error_velocity"] = str(st.session_state.evt_QCT)
     config["QCTest"]["false_target"] = str(st.session_state.ft_QCT)
     config["QCTest"]["three_beam"] = str(st.session_state.is3beam_QCT)
+    if st.session_state.is3beam_QCT:
+        config["QCTest"]["beam_ignore"] = str(st.session_state.beam_to_ignore)
     config["QCTest"]["percent_good"] = str(st.session_state.pgt_QCT)
 
     # Tab 4

pyadps/utils/autoprocess.py

@@ -192,15 +192,20 @@ def autoprocess(config_file, binary_file_path=None):
             evt = config.getint("QCTest", "error_velocity")
             et = config.getint("QCTest", "echo_intensity")
             ft = config.getint("QCTest", "false_target")
-            is3Beam = config.getboolean("QCTest", "three_beam")
+            is3beam = config.getboolean("QCTest", "three_beam")
+            if is3beam != None:
+                is3beam = int(is3beam)
+            beam_ignore = config.get("QCTest","beam_ignore")
             pgt = config.getint("QCTest", "percent_good")
             orientation = config.get("QCTest", "orientation")
+            beam_ignore = config.getboolean("QCTest",)
 
-            mask = pg_check(ds, mask, pgt, threebeam=is3Beam)
-            mask = correlation_check(ds, mask, ct)
-            mask = echo_check(ds, mask, et)
+            mask = pg_check(ds, mask, pgt, threebeam=is3beam)
+            mask = correlation_check(ds, mask, ct,is3beam,beam_ignore=beam_ignore)
+            mask = echo_check(ds, mask, et,is3beam,beam_ignore=beam_ignore)
             mask = ev_check(ds, mask, evt)
-            mask = false_target(ds, mask, ft, threebeam=True)
+            mask = false_target(ds, mask, ft, threebeam=is3beam, beam_ignore=beam_ignore)
+        
 
             print("QC Check Complete.")