Install SeisComP and scanloc ARM64 packages

etc/descriptions/scanloc_multifeature.xml

@@ -25,6 +25,23 @@
 						depth and RMS.
 						</description>
 					</parameter>
+
+					<parameter name="ignoreDepth" type="double" default="650.0">
+						<description>
+						This is the maximum allowed depth. Origins with
+						depth greater then this value get a score equal to
+						&quot;defaultScore&quot;.
+						</description>
+					</parameter>
+
+					<parameter name="maxRMS" type="double" default="1.5">
+						<description>
+						This is the maximum allowed RMS. Origins with
+						residual greater than this value score of equal to
+						&quot;defaultScore&quot;.
+						</description>
+					</parameter>
+
 					<!-- Optional: channel letters for type detection -->
 					<parameter name="strongMotionCodes" type="list:string" default="L,N">
 						<description>
@@ -79,9 +96,6 @@
 							Origin depth is normalized to this value for
 							computing the score contribution. Shallower depths
 							contribute to larger score.
-							This is also the maximum allowed depth. Origins with
-							depth greater then this value get a score equal to
-							&quot;defaultScore&quot;.
 							</description>
 						</parameter>
 
@@ -96,9 +110,6 @@
 							Origin RMS is normalized to this value for computing
 							the score contribution. Lower RMS contribute to
 							larger score.
-							This is also the maximum allowed RMS. Origins with
-							residual greater than this value score equal to
-							&quot;defaultScore&quot;.
 							</description>
 						</parameter>
 

etc/descriptions/scevent_multifeature.xml

@@ -27,6 +27,23 @@
 						depth and RMS.
 						</description>
 					</parameter>
+
+					<parameter name="ignoreDepth" type="double" default="650.0">
+						<description>
+						This is the maximum allowed depth. Origins with
+						depth greater then this value get a score equal to
+						&quot;defaultScore&quot;.
+						</description>
+					</parameter>
+
+					<parameter name="maxRMS" type="double" default="1.5">
+						<description>
+						This is the maximum allowed RMS. Origins with
+						residual greater than this value score of equal to
+						&quot;defaultScore&quot;.
+						</description>
+					</parameter>
+
 					<!-- Optional: channel letters for type detection -->
 					<parameter name="strongMotionCodes" type="list:string" default="L,N">
 						<description>
@@ -76,14 +93,11 @@
 						</parameter>
 
 						<!-- Quality weights -->
-						<parameter name="normalizationDepth" type="double" default="50.0">
+						<parameter name="normalizationDepth" type="double" default="650.0">
 							<description>
 							Origin depth is normalized to this value for
 							computing the score contribution. Shallower depths
 							contribute to larger score.
-							This is also the maximum allowed depth. Origins with
-							depth greater then this value get a score equal to
-							&quot;defaultScore&quot;.
 							</description>
 						</parameter>
 
@@ -93,14 +107,11 @@
 							</description>
 						</parameter>
 
-						<parameter name="normalizationRMS" type="double" default="2.0">
+						<parameter name="normalizationRMS" type="double" default="1.5">
 							<description>
 							Origin RMS is normalized to this value for computing
 							the score contribution. Lower RMS contribute to
 							larger score.
-							This is also the maximum allowed RMS. Origins with
-							residual greater than this value score of equal to
-							&quot;defaultScore&quot;.
 							</description>
 						</parameter>
 

include/seiscomp/version.h

@@ -26,7 +26,7 @@
 
 #define SEISCOMP_VERSION_MAJOR  6
 #define SEISCOMP_VERSION_MINOR  9
-#define SEISCOMP_VERSION_PATCH  0
+#define SEISCOMP_VERSION_PATCH  1
 
 #define SEISCOMP_VERSION ((SEISCOMP_VERSION_MAJOR << 0x10) |\
                           (SEISCOMP_VERSION_MINOR << 0x08) |\

lib/python/seiscomp/fdsnws/availability.py

@@ -12,8 +12,6 @@
 # Email:   herrnkind@gempa.de
 ###############################################################################
 
-from functools import cmp_to_key
-
 from collections import OrderedDict
 
 from twisted.cred import portal
@@ -33,7 +31,7 @@ from . import utils
 
 
 DBMaxUInt = 18446744073709551615  # 2^64 - 1
-VERSION = "1.0.3"
+VERSION = "1.0.4"
 
 
 ###############################################################################
@@ -1349,19 +1347,21 @@ class FDSNAvailabilityQuery(_Availability):
                     if ro.time.start.microseconds() == 0:
                         q += f"AND {_T('end')} >= '{db.timeToString(ro.time.start)}' "
                     else:
+                        startTimeStr = db.timeToString(ro.time.start)
                         q += (
-                            "AND ({0} > '{1}' OR ("
-                            f"{_T('end')} = '{db.timeToString(ro.time.start)}' AND "
+                            f"AND ({_T('end')} > '{startTimeStr}' OR ("
+                            f"{_T('end')} = '{startTimeStr}' AND "
                             f"end_ms >= {ro.time.start.microseconds()})) "
                         )
                 if ro.time.end is not None:
                     if ro.time.end.microseconds() == 0:
                         q += f"AND {_T('start')} < '{db.timeToString(ro.time.end)}' "
                     else:
+                        endTimeStr = db.timeToString(ro.time.end)
                         q += (
-                            "AND ({0} < '{1}' OR ("
-                            f"{_T('start')} = '{db.timeToString(ro.time.end)}' AND "
-                            "start_ms < {ro.time.end.microseconds()})) "
+                            f"AND ({_T('start')} < '{endTimeStr}' OR ("
+                            f"{_T('start')} = '{endTimeStr}' AND "
+                            f"start_ms < {ro.time.end.microseconds()})) "
                         )
             if ro.quality:
                 qualities = "', '".join(ro.quality)

share/doc/scanloc/CHANGELOG

@@ -2,6 +2,12 @@
 
 All notable changes to scanloc and add-ons will be documented in this file.
 
+## 2025.295
+
+## Fixed
+
+-   Bug in S pick association introduced with release 2025.280
+
 ## 2025.280
 
 ## Added

share/doc/scanloc/html/_sources/apps/scanloc.rst.txt

@@ -2361,6 +2361,28 @@ score processor.
    depth and RMS.
 
 
+.. confval:: score.mf.ignoreDepth
+
+   Default: ``650.0``
+
+   Type: *double*
+
+   This is the maximum allowed depth. Origins with
+   depth greater then this value get a score equal to
+   \"defaultScore\".
+
+
+.. confval:: score.mf.maxRMS
+
+   Default: ``1.5``
+
+   Type: *double*
+
+   This is the maximum allowed RMS. Origins with
+   residual greater than this value score of equal to
+   \"defaultScore\".
+
+
 .. confval:: score.mf.strongMotionCodes
 
    Default: ``L,N``
@@ -2436,9 +2458,6 @@ score processor.
    Origin depth is normalized to this value for
    computing the score contribution. Shallower depths
    contribute to larger score.
-   This is also the maximum allowed depth. Origins with
-   depth greater then this value get a score equal to
-   \"defaultScore\".
 
 
 .. confval:: score.mf.weights.depth
@@ -2459,9 +2478,6 @@ score processor.
    Origin RMS is normalized to this value for computing
    the score contribution. Lower RMS contribute to
    larger score.
-   This is also the maximum allowed RMS. Origins with
-   residual greater than this value score equal to
-   \"defaultScore\".
 
 
 .. confval:: score.mf.weights.residual

share/doc/scanloc/html/_sources/base/CHANGELOG.md.txt

@@ -2,6 +2,12 @@
 
 All notable changes to scanloc and add-ons will be documented in this file.
 
+## 2025.295
+
+## Fixed
+
+-   Bug in S pick association introduced with release 2025.280
+
 ## 2025.280
 
 ## Added

share/doc/scanloc/html/apps/global.html

@@ -24,7 +24,7 @@
         <img class="background" src="../_static/icon.png"/>
         <div class="content">
            <span class="title">scanloc: Phase Associator </span>
-           <span class="version">2025.281#4efc2c878</span></h1>
+           <span class="version">2025.295#8bb1059a0</span></h1>
         </div>
       </div>
     </div>
@@ -2807,7 +2807,7 @@ GUI applications.</p>
     <div class="footer">
       <div class="container">
         <div class="content">
-        Release <b></b> version <b>2025.281#4efc2c878</b>
+        Release <b></b> version <b>2025.295#8bb1059a0</b>
           <div class="copyright">
             &copy; Copyright <a href="https://www.gempa.de">2014, gempa GmbH.</a>
           </div>

share/doc/scanloc/html/apps/scanloc.html

@@ -26,7 +26,7 @@
         <img class="background" src="../_static/icon.png"/>
         <div class="content">
            <span class="title">scanloc: Phase Associator </span>
-           <span class="version">2025.281#4efc2c878</span></h1>
+           <span class="version">2025.295#8bb1059a0</span></h1>
         </div>
       </div>
     </div>
@@ -2083,6 +2083,26 @@ completely or is filtered out by thresholds such as for
 depth and RMS.</p>
 </dd></dl>
 
+<dl class="std confval">
+<dt class="sig sig-object std" id="confval-score.mf.ignoreDepth">
+<span class="sig-name descname"><span class="pre">score.mf.ignoreDepth</span></span><a class="headerlink" href="#confval-score.mf.ignoreDepth" title="Permalink to this definition">¶</a></dt>
+<dd><p>Default: <code class="docutils literal notranslate"><span class="pre">650.0</span></code></p>
+<p>Type: <em>double</em></p>
+<p>This is the maximum allowed depth. Origins with
+depth greater then this value get a score equal to
+&quot;defaultScore&quot;.</p>
+</dd></dl>
+
+<dl class="std confval">
+<dt class="sig sig-object std" id="confval-score.mf.maxRMS">
+<span class="sig-name descname"><span class="pre">score.mf.maxRMS</span></span><a class="headerlink" href="#confval-score.mf.maxRMS" title="Permalink to this definition">¶</a></dt>
+<dd><p>Default: <code class="docutils literal notranslate"><span class="pre">1.5</span></code></p>
+<p>Type: <em>double</em></p>
+<p>This is the maximum allowed RMS. Origins with
+residual greater than this value score of equal to
+&quot;defaultScore&quot;.</p>
+</dd></dl>
+
 <dl class="std confval">
 <dt class="sig sig-object std" id="confval-score.mf.strongMotionCodes">
 <span class="sig-name descname"><span class="pre">score.mf.strongMotionCodes</span></span><a class="headerlink" href="#confval-score.mf.strongMotionCodes" title="Permalink to this definition">¶</a></dt>
@@ -2147,10 +2167,7 @@ Example: 1.0,0.0,0.0 .</p>
 <p>Type: <em>double</em></p>
 <p>Origin depth is normalized to this value for
 computing the score contribution. Shallower depths
-contribute to larger score.
-This is also the maximum allowed depth. Origins with
-depth greater then this value get a score equal to
-&quot;defaultScore&quot;.</p>
+contribute to larger score.</p>
 </dd></dl>
 
 <dl class="std confval">
@@ -2168,10 +2185,7 @@ depth greater then this value get a score equal to
 <p>Type: <em>double</em></p>
 <p>Origin RMS is normalized to this value for computing
 the score contribution. Lower RMS contribute to
-larger score.
-This is also the maximum allowed RMS. Origins with
-residual greater than this value score equal to
-&quot;defaultScore&quot;.</p>
+larger score.</p>
 </dd></dl>
 
 <dl class="std confval">
@@ -2792,7 +2806,7 @@ is unformatted.</p>
     <div class="footer">
       <div class="container">
         <div class="content">
-        Release <b></b> version <b>2025.281#4efc2c878</b>
+        Release <b></b> version <b>2025.295#8bb1059a0</b>
           <div class="copyright">
             &copy; Copyright <a href="https://www.gempa.de">2014, gempa GmbH.</a>
           </div>

share/doc/scanloc/html/base/auxiliary.html

@@ -26,7 +26,7 @@
         <img class="background" src="../_static/icon.png"/>
         <div class="content">
            <span class="title">scanloc: Phase Associator </span>
-           <span class="version">2025.281#4efc2c878</span></h1>
+           <span class="version">2025.295#8bb1059a0</span></h1>
         </div>
       </div>
     </div>
@@ -513,7 +513,7 @@ before picks and amplitudes.</p>
     <div class="footer">
       <div class="container">
         <div class="content">
-        Release <b></b> version <b>2025.281#4efc2c878</b>
+        Release <b></b> version <b>2025.295#8bb1059a0</b>
           <div class="copyright">
             &copy; Copyright <a href="https://www.gempa.de">2014, gempa GmbH.</a>
           </div>

share/doc/scanloc/html/base/glossary.html

@@ -26,7 +26,7 @@
         <img class="background" src="../_static/icon.png"/>
         <div class="content">
            <span class="title">scanloc: Phase Associator </span>
-           <span class="version">2025.281#4efc2c878</span></h1>
+           <span class="version">2025.295#8bb1059a0</span></h1>
         </div>
       </div>
     </div>
@@ -1328,7 +1328,7 @@ or any other site to the rupture surface of the seismic event.</p>
     <div class="footer">
       <div class="container">
         <div class="content">
-        Release <b></b> version <b>2025.281#4efc2c878</b>
+        Release <b></b> version <b>2025.295#8bb1059a0</b>
           <div class="copyright">
             &copy; Copyright <a href="https://www.gempa.de">2014, gempa GmbH.</a>
           </div>

share/doc/scanloc/html/base/gradients.html

@@ -24,7 +24,7 @@
         <img class="background" src="../_static/icon.png"/>
         <div class="content">
            <span class="title">scanloc: Phase Associator </span>
-           <span class="version">2025.281#4efc2c878</span></h1>
+           <span class="version">2025.295#8bb1059a0</span></h1>
         </div>
       </div>
     </div>
@@ -381,7 +381,7 @@ white.</p>
     <div class="footer">
       <div class="container">
         <div class="content">
-        Release <b></b> version <b>2025.281#4efc2c878</b>
+        Release <b></b> version <b>2025.295#8bb1059a0</b>
           <div class="copyright">
             &copy; Copyright <a href="https://www.gempa.de">2014, gempa GmbH.</a>
           </div>

share/doc/scanloc/html/base/introduction.html

@@ -26,7 +26,7 @@
         <img class="background" src="../_static/icon.png"/>
         <div class="content">
            <span class="title">scanloc: Phase Associator </span>
-           <span class="version">2025.281#4efc2c878</span></h1>
+           <span class="version">2025.295#8bb1059a0</span></h1>
         </div>
       </div>
     </div>
@@ -198,7 +198,7 @@ AGU Fall Meeting, San Francisco, USA,
     <div class="footer">
       <div class="container">
         <div class="content">
-        Release <b></b> version <b>2025.281#4efc2c878</b>
+        Release <b></b> version <b>2025.295#8bb1059a0</b>
           <div class="copyright">
             &copy; Copyright <a href="https://www.gempa.de">2014, gempa GmbH.</a>
           </div>

share/doc/scanloc/html/base/locsat-tables.html

@@ -26,7 +26,7 @@
         <img class="background" src="../_static/icon.png"/>
         <div class="content">
            <span class="title">scanloc: Phase Associator </span>
-           <span class="version">2025.281#4efc2c878</span></h1>
+           <span class="version">2025.295#8bb1059a0</span></h1>
         </div>
       </div>
     </div>
@@ -176,7 +176,7 @@ LOCSAT.profiles = iasp91_scanloc
     <div class="footer">
       <div class="container">
         <div class="content">
-        Release <b></b> version <b>2025.281#4efc2c878</b>
+        Release <b></b> version <b>2025.295#8bb1059a0</b>
           <div class="copyright">
             &copy; Copyright <a href="https://www.gempa.de">2014, gempa GmbH.</a>
           </div>

share/doc/scanloc/html/base/references.html

@@ -26,7 +26,7 @@
         <img class="background" src="../_static/icon.png"/>
         <div class="content">
            <span class="title">scanloc: Phase Associator </span>
-           <span class="version">2025.281#4efc2c878</span></h1>
+           <span class="version">2025.295#8bb1059a0</span></h1>
         </div>
       </div>
     </div>
@@ -271,7 +271,7 @@
     <div class="footer">
       <div class="container">
         <div class="content">
-        Release <b></b> version <b>2025.281#4efc2c878</b>
+        Release <b></b> version <b>2025.295#8bb1059a0</b>
           <div class="copyright">
             &copy; Copyright <a href="https://www.gempa.de">2014, gempa GmbH.</a>
           </div>

share/doc/scanloc/html/base/sphase-detector.html

@@ -25,7 +25,7 @@
         <img class="background" src="../_static/icon.png"/>
         <div class="content">
            <span class="title">scanloc: Phase Associator </span>
-           <span class="version">2025.281#4efc2c878</span></h1>
+           <span class="version">2025.295#8bb1059a0</span></h1>
         </div>
       </div>
     </div>
@@ -329,7 +329,7 @@ the bindings parameter of <strong class="program">scautopick</strong> or the res
     <div class="footer">
       <div class="container">
         <div class="content">
-        Release <b></b> version <b>2025.281#4efc2c878</b>
+        Release <b></b> version <b>2025.295#8bb1059a0</b>
           <div class="copyright">
             &copy; Copyright <a href="https://www.gempa.de">2014, gempa GmbH.</a>
           </div>

share/doc/scanloc/html/genindex.html

@@ -23,7 +23,7 @@
         <img class="background" src="_static/icon.png"/>
         <div class="content">
            <span class="title">scanloc: Phase Associator </span>
-           <span class="version">2025.281#4efc2c878</span></h1>
+           <span class="version">2025.295#8bb1059a0</span></h1>
         </div>
       </div>
     </div>
@@ -1947,8 +1947,12 @@
         <li><a href="apps/scanloc.html#confval-score">score</a>
 </li>
         <li><a href="apps/scanloc.html#confval-score.mf.defaultScore">score.mf.defaultScore</a>
+</li>
+        <li><a href="apps/scanloc.html#confval-score.mf.ignoreDepth">score.mf.ignoreDepth</a>
 </li>
         <li><a href="apps/scanloc.html#confval-score.mf.infrasoundCodes">score.mf.infrasoundCodes</a>
+</li>
+        <li><a href="apps/scanloc.html#confval-score.mf.maxRMS">score.mf.maxRMS</a>
 </li>
         <li><a href="apps/scanloc.html#confval-score.mf.strongMotionCodes">score.mf.strongMotionCodes</a>
 </li>
@@ -3007,6 +3011,13 @@
 
       <ul>
         <li><a href="apps/scanloc.html#confval-score.mf.defaultScore">configuration value</a>
+</li>
+      </ul></li>
+      <li>
+    score.mf.ignoreDepth
+
+      <ul>
+        <li><a href="apps/scanloc.html#confval-score.mf.ignoreDepth">configuration value</a>
 </li>
       </ul></li>
       <li>
@@ -3014,6 +3025,13 @@
 
       <ul>
         <li><a href="apps/scanloc.html#confval-score.mf.infrasoundCodes">configuration value</a>
+</li>
+      </ul></li>
+      <li>
+    score.mf.maxRMS
+
+      <ul>
+        <li><a href="apps/scanloc.html#confval-score.mf.maxRMS">configuration value</a>
 </li>
       </ul></li>
       <li>
@@ -3192,12 +3210,12 @@
 </li>
       <li><a href="base/glossary.html#term-SeedLink"><strong>SeedLink</strong></a>
 </li>
+  </ul></td>
+  <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="base/glossary.html#term-SeisComP"><strong>SeisComP</strong></a>
 </li>
       <li><a href="base/glossary.html#term-SeisComP3"><strong>SeisComP3</strong></a>
 </li>
-  </ul></td>
-  <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="base/glossary.html#term-seismic-array"><strong>seismic array</strong></a>
 </li>
       <li><a href="base/glossary.html#term-seismic-gap"><strong>seismic gap</strong></a>
@@ -3514,7 +3532,7 @@
     <div class="footer">
       <div class="container">
         <div class="content">
-        Release <b></b> version <b>2025.281#4efc2c878</b>
+        Release <b></b> version <b>2025.295#8bb1059a0</b>
           <div class="copyright">
             &copy; Copyright <a href="https://www.gempa.de">2014, gempa GmbH.</a>
           </div>