Merge pull request #115 from IPGP/dev-tpx1_01a

v2.3.2

Author: PierreS-alpha

README.md

@@ -3,8 +3,8 @@
 # autorino
 autorino is a tool for _Assisted Unloading, Treatment & Organisation of RINex Observations_  🛰️ 🌐 🦏 
 
-**Version: 2.3.1**  
-**Date: 2025-08-29**
+**Version: 2.3.2**  
+**Date: 2025-11-20**
 
 **Main developper:** [Pierre Sakic](https://github.com/PierreS-alpha) (IPGP-OVS, Paris, France)  
 **Contact e-mail:** sakic@ipgp.fr

autorino/__init__.py

@@ -10,7 +10,7 @@
 import os
 from os import path
 
-__version__ = "2.3.1"  #  changed automaticcaly with bump-my-version
+__version__ = "2.3.2"  #  changed automaticcaly with bump-my-version
 
 #### IMPORT CONFIG FOR LOGGER
 log_file_path = os.path.join(

autorino/api/convert_rnx.py

@@ -35,6 +35,7 @@ def convert_rnx(
     raw_out_structure=None,
     processes=1,
     filter_prev_tables=False,
+    converter="auto"
 ):
     """
     Frontend function that performs RAW > RINEX conversion.
@@ -93,6 +94,9 @@ def convert_rnx(
         If True, filters and skip previously converted files
         with tables stored in the tmp tables directory.
         Default is False.
+    converter: str, optional
+        The software to be used for converting the RAW files to RINEX.
+        Default is "auto".
 
     Returns
     -------
@@ -124,6 +128,7 @@ def convert_rnx(
             force_rnx,
             rinexmod_options,
             filter_prev_tables,
+            converter,
         )
         args_wrap.append(args)
 
@@ -200,6 +205,8 @@ def convert_raw_wrap(args):
         - filter_prev_tables : bool
             If True, filters and skips previously converted files with
             tables stored in the tmp tables directory.
+        - converter : str
+            The software to be used for converting the RAW files to RINEX.
 
     Returns
     -------
@@ -215,6 +222,7 @@ def convert_raw_wrap(args):
         force_rnx,
         rinexmod_options,
         filter_prev_tables,
+        converter
     ) = args
     # Initialize the ConvertGnss object with the provided directories and metadata
     cnv = arocnv.ConvertGnss(out_dir_use, tmp_dir, log_dir, metadata=metadata)
@@ -225,6 +233,7 @@ def convert_raw_wrap(args):
         force=force_rnx,
         rinexmod_options=rinexmod_options,
         filter_prev_tables=filter_prev_tables,
+        converter=converter,
     )
     # Return the ConvertGnss object containing the conversion results
     return cnv

autorino/bin/autorino_convert_rnx.py

@@ -137,6 +137,27 @@ def main():
         default=False,
     )
 
+    parser.add_argument(
+        "-c",
+        "--converter",
+        help="The software to be used for converting the RAW files to RINEX. "
+             "Default is 'auto' which lets autorino choose the best available converter based on RAW file extension."
+             "Possible values are:"
+             "* 'auto' (automatic choice based on the extension),"
+             "* 'trm2rnx' (Trimble unofficial),"
+             "* 't0xconvert' (Trimble official),"
+             "* 'runpkr00' (Trimble legacy),"
+             "* 'teqc' (legacy conversion & RINEX Handeling),"
+             "* 'mdb2rinex' (Leica),"
+             "* 'sbf2rin' (Septentrio),"
+             "* 'convbin' (BINEX),"
+             "* 'tps2rin' (Topcon),"
+             "* 'converto' (RINEX Handeling),"
+             "* 'gfzrnx' (RINEX Handeling)",
+        default="auto",
+    )
+
+
     args = parser.parse_args()
 
     aroapi.convert_rnx(
@@ -153,6 +174,7 @@ def main():
         raw_out_structure=args.raw_out_structure,
         processes=args.processes,
         filter_prev_tables=args.filter_prev_tables,
+        converter=args.converter
     )
 
 

autorino/bin/autorino_splice_rnx_relative.py

@@ -0,0 +1,104 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on 25/10/2025 16:09:59
+
+@author: psakic
+"""
+
+import argparse
+import yaml
+from autorino.api.splice_rnx_rel import splice_rnx_rel
+
+
+def main():
+    parser = argparse.ArgumentParser(description=splice_rnx_rel.__doc__)
+    parser.add_argument(
+        "-i", "--rnxs_inp",
+        required=True,
+        nargs="+",
+        help="The input RINEX files to be spliced. The input can be a list, a text file path, a tuple of text files or a directory path."
+    )
+    parser.add_argument(
+        "-o", "--out_dir",
+        required=True,
+        help="The output directory where the spliced files will be stored."
+    )
+    parser.add_argument(
+        "-t", "--tmp_dir",
+        required=True,
+        help="The temporary directory used during the splicing process."
+    )
+    parser.add_argument(
+        "-l", "--log_dir",
+        default=None,
+        help="The directory where logs will be stored. (optional)"
+    )
+    parser.add_argument(
+        "-S", "--handle_software",
+        default="converto",
+        help="The software to be used for handling the RINEX files during the splice operation. Defaults to 'converto'. (optional)"
+    )
+    parser.add_argument(
+        "-p", "--period",
+        default="1d",
+        help="The period for splicing the RINEX files. Defaults to '1d'. (optional)"
+    )
+    parser.add_argument(
+        "-R", "--rolling_period",
+        action="store_true",
+        help="Whether to use a rolling period for splicing the RINEX files. (optional)"
+    )
+    parser.add_argument(
+        "-r", "--rolling_ref",
+        default="-1",
+        help="The reference for the rolling period (datetime-like or int). Use -1 for the last epoch. (optional)"
+    )
+    parser.add_argument(
+        "-m", "--round_method",
+        default="floor",
+        help="The method for rounding the epochs during the splice operation. Defaults to 'floor'. (optional)"
+    )
+    parser.add_argument(
+        "-d", "--drop_epoch_rnd",
+        action="store_true",
+        help="Whether to drop the rounded epochs during the splice operation. (optional)"
+    )
+    parser.add_argument(
+        "-x", "--rinexmod_options",
+        type=yaml.safe_load,
+        default=None,
+        help="Options for modifying the RINEX files, provided as a YAML/JSON string or file content (e.g. '{longname: False}'). (optional)"
+    )
+    parser.add_argument(
+        "-M", "--metadata",
+        nargs="+",
+        default=None,
+        help="Metadata to include (list of sitelog paths, single sitelog path, directory, or MetaData objects). (optional)"
+    )
+
+    args = parser.parse_args()
+
+    rolling_ref_val = args.rolling_ref
+
+    spc_main_obj = splice_rnx_rel(
+        rnxs_inp=args.rnxs_inp,
+        out_dir=args.out_dir,
+        tmp_dir=args.tmp_dir,
+        log_dir=args.log_dir,
+        handle_software=args.handle_software,
+        period=args.period,
+        rolling_period=args.rolling_period,
+        rolling_ref=rolling_ref_val,
+        round_method=args.round_method,
+        drop_epoch_rnd=args.drop_epoch_rnd,
+        rinexmod_options=args.rinexmod_options,
+        metadata=args.metadata,
+    )
+
+    # Optionally print a short summary or representation
+    if spc_main_obj is not None:
+        print(spc_main_obj)
+
+if __name__ == "__main__":
+    main()

autorino/convert/cnv_cmd_run.py

@@ -156,7 +156,7 @@ def _convert_select(converter_inp, inp_raw_fpath=None):
         bin_kwoptions = dict()
 
     # +++++ SEPTENTRIO
-    elif re.match(".[0-9]{2}_", ext) or converter_inp == "sbf2rin":
+    elif re.match(".([0-9]{2}_|A)", ext) or converter_inp == "sbf2rin":
         converter_name = "sbf2rin"
         brand = "Septentrio"
         cmd_build_fct = arocnv.cmd_build_sbf2rin

configfiles/main/autorino_main_cfg.yml

@@ -18,6 +18,7 @@ environment:
     converto : "ConvertoCPP" # Path to ConvertoCPP tool.
     gfzrnx : "gfzrnx" # Path to GFZRNX tool.
     teqc : "teqc" # Path to TEQC tool.
+    # NB: custom handle_software ('converto' or 'gfzrnx') must be defined as an option within splice/split steps.
   general:
     log_level: "DEBUG" # Logging level for the application.
     trimble_default_software: "trm2rinex" # Default Trimble converter key (lowercase).

docs/_modules/autorino/api/check_rnx.html

@@ -6,7 +6,7 @@
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>autorino.api.check_rnx &mdash; autorino  documentation</title>
-      <link rel="stylesheet" type="text/css" href="../../../_static/pygments.css?v=80d5e7a1" />
+      <link rel="stylesheet" type="text/css" href="../../../_static/pygments.css?v=b86133f3" />
       <link rel="stylesheet" type="text/css" href="../../../_static/css/theme.css?v=e59714d7" />
       <link rel="stylesheet" type="text/css" href="../../../_static/dark_mode_css/general.css?v=c0a7eb24" />
       <link rel="stylesheet" type="text/css" href="../../../_static/dark_mode_css/dark.css?v=70edf1c7" />
@@ -52,6 +52,7 @@
 <li class="toctree-l1"><a class="reference internal" href="../../../config_files_nutshell.html">Configuration files in a nutshell</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../../../config_files_details.html">Configuration file details</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../../../under_hood.html">Under the hood</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../../../under_hood.html#about-epoch-range-and-timing">About <em>epoch range</em> and timing.</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../../../autorino.html">autorino package</a></li>
 </ul>
 
@@ -87,23 +88,23 @@ <h1>Source code for autorino.api.check_rnx</h1><div class="highlight"><pre>
 
 <span class="sd">@author: psakic</span>
 <span class="sd">&quot;&quot;&quot;</span>
-<span class="kn">import</span> <span class="nn">matplotlib.pyplot</span> <span class="k">as</span> <span class="nn">plt</span>
+<span class="kn">import</span><span class="w"> </span><span class="nn">matplotlib.pyplot</span><span class="w"> </span><span class="k">as</span><span class="w"> </span><span class="nn">plt</span>
 
-<span class="kn">import</span> <span class="nn">autorino.cfgenv</span> <span class="k">as</span> <span class="nn">aroenv</span>
-<span class="kn">import</span> <span class="nn">autorino.check</span> <span class="k">as</span> <span class="nn">arochk</span>
-<span class="kn">import</span> <span class="nn">autorino.common</span> <span class="k">as</span> <span class="nn">arocmn</span>
-<span class="kn">import</span> <span class="nn">pandas</span> <span class="k">as</span> <span class="nn">pd</span>
-<span class="kn">import</span> <span class="nn">os</span>
-<span class="kn">import</span> <span class="nn">logging</span>
-<span class="kn">from</span> <span class="nn">geodezyx</span> <span class="kn">import</span> <span class="n">utils</span>
+<span class="kn">import</span><span class="w"> </span><span class="nn">autorino.cfgenv</span><span class="w"> </span><span class="k">as</span><span class="w"> </span><span class="nn">aroenv</span>
+<span class="kn">import</span><span class="w"> </span><span class="nn">autorino.check</span><span class="w"> </span><span class="k">as</span><span class="w"> </span><span class="nn">arochk</span>
+<span class="kn">import</span><span class="w"> </span><span class="nn">autorino.common</span><span class="w"> </span><span class="k">as</span><span class="w"> </span><span class="nn">arocmn</span>
+<span class="kn">import</span><span class="w"> </span><span class="nn">pandas</span><span class="w"> </span><span class="k">as</span><span class="w"> </span><span class="nn">pd</span>
+<span class="kn">import</span><span class="w"> </span><span class="nn">os</span>
+<span class="kn">import</span><span class="w"> </span><span class="nn">logging</span>
+<span class="kn">from</span><span class="w"> </span><span class="nn">geodezyx</span><span class="w"> </span><span class="kn">import</span> <span class="n">utils</span>
 
 <span class="n">logger</span> <span class="o">=</span> <span class="n">logging</span><span class="o">.</span><span class="n">getLogger</span><span class="p">(</span><span class="s2">&quot;autorino&quot;</span><span class="p">)</span>
 <span class="n">logger</span><span class="o">.</span><span class="n">setLevel</span><span class="p">(</span><span class="n">aroenv</span><span class="o">.</span><span class="n">ARO_ENV_DIC</span><span class="p">[</span><span class="s2">&quot;general&quot;</span><span class="p">][</span><span class="s2">&quot;log_level&quot;</span><span class="p">])</span>
 
 
 <div class="viewcode-block" id="check_rnx">
 <a class="viewcode-back" href="../../../autorino.api.html#autorino.api.check_rnx.check_rnx">[docs]</a>
-<span class="k">def</span> <span class="nf">check_rnx</span><span class="p">(</span>
+<span class="k">def</span><span class="w"> </span><span class="nf">check_rnx</span><span class="p">(</span>
     <span class="n">inp_dir_parent</span><span class="p">,</span>
     <span class="n">inp_dir_structure</span><span class="p">,</span>
     <span class="n">epoch_start</span><span class="p">,</span>
@@ -112,7 +113,8 @@ <h1>Source code for autorino.api.check_rnx</h1><div class="highlight"><pre>
     <span class="n">output_dir</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
 <span class="p">):</span>
 <span class="w">    </span><span class="sd">&quot;&quot;&quot;</span>
-<span class="sd">    This function checks the RINEX files in the input directory.</span>
+<span class="sd">    Checks the presence of RINEX files in the input directory over a specified time range,</span>
+<span class="sd">    and computes their completeness ratio.</span>
 
 <span class="sd">    Parameters</span>
 <span class="sd">    ----------</span>
@@ -188,7 +190,7 @@ <h1>Source code for autorino.api.check_rnx</h1><div class="highlight"><pre>
 <span class="c1"># checkrnx_format</span>
 <div class="viewcode-block" id="checkrnx_output">
 <a class="viewcode-back" href="../../../autorino.api.html#autorino.api.check_rnx.checkrnx_output">[docs]</a>
-<span class="k">def</span> <span class="nf">checkrnx_output</span><span class="p">(</span>
+<span class="k">def</span><span class="w"> </span><span class="nf">checkrnx_output</span><span class="p">(</span>
     <span class="n">output_dir</span><span class="p">,</span> <span class="n">eporng</span><span class="p">,</span> <span class="n">tabu_chk_col</span><span class="p">,</span> <span class="n">tabu_chk_bnw</span><span class="p">,</span> <span class="n">df_chk_sum</span><span class="p">,</span> <span class="n">df_chk_full_stats</span>
 <span class="p">):</span>
 <span class="w">    </span><span class="sd">&quot;&quot;&quot;</span>