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

pyadps/pages/01_Read_File.py

@@ -20,10 +20,10 @@ if "fname" not in st.session_state:
     st.session_state.fname = "No file selected"
 
 if "rawfilename" not in st.session_state:
-    st.session_state.rawfilename = "rawfile.nc"
+    st.session_state.rawfilename = "RAW_DAT.nc"
 
 if "vleadfilename" not in st.session_state:
-    st.session_state.vleadfilename = "vlead.nc"
+    st.session_state.vleadfilename = "RAW_VAR.nc"
 
 
 ################ Functions #######################
@@ -132,6 +132,7 @@ if uploaded_file is not None:
     st.session_state.salinity = (
         ds.variableleader.salinity.data * ds.variableleader.salinity.scale
     )
+    st.session_state.filename = (ds.filename)
 
     # st.session_state.flead = flead
     # st.session_state.vlead = vlead

pyadps/pages/03_Download_Raw_File.py

@@ -18,13 +18,13 @@ if "fname" not in st.session_state:
     st.session_state.fname = "No file selected"
 
 if "rawfilename" not in st.session_state:
-    st.session_state.rawfilename = "rawfile.nc"
+    st.session_state.rawfilename = "RAW_DAT.nc"
 
 if "fleadfilename" not in st.session_state:
-    st.session_state.fleadfilename = "flead.nc"
+    st.session_state.fleadfilename = "RAW_FIX.nc"
 
 if "vleadfilename" not in st.session_state:
-    st.session_state.vleadfilename = "vlead.nc"
+    st.session_state.vleadfilename = "RAW_VAR.nc"
 
 if "attributes" not in st.session_state:
     st.session_state.attributes = {}
@@ -32,6 +32,18 @@ if "attributes" not in st.session_state:
 if "add_attributes_DRW" not in st.session_state:
     st.session_state.add_attributes_DRW = "No"  # Default value
 
+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.file_prefix = st.session_state.filename
+
+
+if "prefix_saved" not in st.session_state:
+    st.session_state.prefix_saved = False
+
+if "filename" not in st.session_state:
+    st.session_state.filename = ""  # <-- Default file name if not passed
+
 
 ################ Functions #######################
 @st.cache_data()
@@ -51,59 +63,66 @@ def read_file(filepath):
     st.session_state.ds = ds
 
 
+@st.cache_data
+def get_prefixed_filename(base_name):
+    """Generates the file name with the optional prefix."""
+    if st.session_state.file_prefix:
+        return f"{st.session_state.file_prefix}_{base_name}"
+    return base_name
+
+
 @st.cache_data
 def file_write(path, axis_option, add_attributes=True):
     tempdirname = tempfile.TemporaryDirectory(delete=False)
-    st.session_state.rawfilename = tempdirname.name + "/rawfile.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 = tempvardirname.name + "/flead.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 = tempvardirname.name + "/vlead.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:
@@ -149,6 +168,32 @@ if st.session_state.add_attributes_DRW == "Yes":
 
     st.write("Attributes will be added to the NetCDF file once you submit.")
 
+
+st.info(f"Current file name: **{st.session_state.filename}**")
+
+# Prefix editing option
+st.session_state.use_custom_filename = st.radio(
+    "Do you want to edit Output Filename?",
+    ["No", "Yes"],
+    horizontal=True,
+)
+
+if st.session_state.use_custom_filename == "Yes" and not st.session_state.prefix_saved:
+    st.session_state.file_prefix = st.text_input(
+        "Enter file name (e.g., GD10A000)",
+        value=st.session_state.file_prefix,
+    )
+
+    if st.button("Save Filename"):
+        if st.session_state.file_prefix.strip():
+            st.session_state.prefix_saved = True
+            st.rerun()
+        else:
+            st.warning("Please enter a valid filename before saving.")
+
+if st.session_state.prefix_saved:
+    st.success(f"Filename saved as: **{st.session_state.file_prefix}**")
+
 # Dropdown for axis_option
 st.session_state.axis_option_DRW = st.selectbox(
     "Select x-axis option:",
@@ -179,7 +224,7 @@ if st.session_state.rawnc_download_DRW:
         st.download_button(
             label="Download Raw File",
             data=file,
-            file_name="rawfile.nc",
+            file_name=get_prefixed_filename("RAW_DAT.nc"),
         )
 
 if st.session_state.fleadnc_download_DRW:
@@ -193,7 +238,7 @@ if st.session_state.fleadnc_download_DRW:
         st.download_button(
             label="Download Fixed Leader",
             data=file,
-            file_name="flead.nc",
+            file_name=get_prefixed_filename("RAW_FIX.nc"),
         )
 
 if st.session_state.vleadnc_download_DRW:
@@ -207,7 +252,7 @@ if st.session_state.vleadnc_download_DRW:
         st.download_button(
             label="Download Variable Leader",
             data=file,
-            file_name="vlead.nc",
+            file_name=get_prefixed_filename("RAW_VAR.nc"),
         )
 
 

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/06_Profile_Test.py

@@ -797,8 +797,8 @@ with tab4:
                 orientation=st.session_state.beam_direction_QCT,
                 method=st.session_state.interpolate_PT,
                 boundary_limit=boundary,
-                cells=cells,
-                cell_size=cell_size,
+                cells=fdata['Cells'],
+                cell_size=fdata['Depth Cell Len'],
                 bin1dist=bin1dist,
                 beams=beams,
             )
@@ -813,8 +813,8 @@ with tab4:
                 orientation=st.session_state.beam_direction_QCT,
                 method=st.session_state.interpolate_PT,
                 boundary_limit=boundary,
-                cells=cells,
-                cell_size=cell_size,
+                cells=fdata['Cells'],
+                cell_size=fdata['Depth Cell Len'],
                 bin1dist=bin1dist,
                 beams=beams,
             )
@@ -829,8 +829,8 @@ with tab4:
                 orientation=st.session_state.beam_direction_QCT,
                 method=st.session_state.interpolate_PT,
                 boundary_limit=boundary,
-                cells=cells,
-                cell_size=cell_size,
+                cells=fdata['Cells'],
+                cell_size=fdata['Depth Cell Len'],
                 bin1dist=bin1dist,
                 beams=beams,
             )
@@ -845,8 +845,8 @@ with tab4:
                 orientation=st.session_state.beam_direction_QCT,
                 method=st.session_state.interpolate_PT,
                 boundary_limit=boundary,
-                cells=cells,
-                cell_size=cell_size,
+                cells=fdata['Cells'],
+                cell_size=fdata['Depth Cell Len'],
                 bin1dist=bin1dist,
                 beams=beams,
             )
@@ -862,8 +862,8 @@ with tab4:
                 orientation=st.session_state.beam_direction_QCT,
                 method="nearest",
                 boundary_limit=boundary,
-                cells=cells,
-                cell_size=cell_size,
+                cells=fdata['Cells'],
+                cell_size=fdata['Depth Cell Len'],
                 bin1dist=bin1dist,
             )
 

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
@@ -16,10 +16,23 @@ if "fname" not in st.session_state:
     st.session_state.fname = "No file selected"
 
 if "rawfilename" not in st.session_state:
-    st.session_state.rawfilename = "rawfile.nc"
+    st.session_state.rawfilename = "RAW_DAT.nc"
 
 if "vleadfilename" not in st.session_state:
-    st.session_state.vleadfilename = "vlead.nc"
+    st.session_state.vleadfilename = "RAW_VAR.nc"
+
+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.file_prefix = st.session_state.filename
+
+
+if "prefix_saved" not in st.session_state:
+    st.session_state.prefix_saved = False
+
+if "filename" not in st.session_state:
+    st.session_state.filename = ""  # <-- Default file name if not passed
+
 
 
 # Check if attributes exist in session state
@@ -72,9 +85,15 @@ else:
 if "depth_axis" not in st.session_state:
     st.session_state.isRegridCheck_PT = False
 
+@st.cache_data
+def get_prefixed_filename(base_name):
+    """Generates the file name with the optional prefix."""
+    if st.session_state.file_prefix:
+        return f"{st.session_state.file_prefix}_{base_name}"
+    return base_name
 
 @st.cache_data
-def file_write(filename="processed_file.nc"):
+def file_write(filename=get_prefixed_filename("PRO_DAT.nc")):
     tempdirname = tempfile.TemporaryDirectory(delete=False)
     outfilepath = tempdirname.name + "/" + filename
     return outfilepath
@@ -297,7 +316,7 @@ if download_button:
             st.download_button(
                 label="Download NetCDF File",
                 data=file,
-                file_name="processed_file.nc",
+                file_name=get_prefixed_filename("PRO_DAT.nc"),
             )
 
     if st.session_state.file_type_WF == "CSV":
@@ -487,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.")