diff --git a/bin/scanloc b/bin/scanloc index 7ab4278..5d00251 100755 Binary files a/bin/scanloc and b/bin/scanloc differ diff --git a/bin/scconfig b/bin/scconfig index 5cd59bf..365403e 100755 Binary files a/bin/scconfig and b/bin/scconfig differ diff --git a/bin/scinv b/bin/scinv index 883fb1b..250cb62 100755 Binary files a/bin/scinv and b/bin/scinv differ diff --git a/include/seiscomp/system/pluginregistry.h b/include/seiscomp/system/pluginregistry.h index 6fc82e3..29f2cf0 100644 --- a/include/seiscomp/system/pluginregistry.h +++ b/include/seiscomp/system/pluginregistry.h @@ -122,13 +122,16 @@ class SC_SYSTEM_CORE_API PluginRegistry { //! Returns the end iterator over all registered plugins iterator end() const; + //! Returns the list of errors after calling loadPlugins. + const std::vector &errors() const; + // ---------------------------------------------------------------------- // Private members // ---------------------------------------------------------------------- private: std::string find(const std::string &name) const; - PluginEntry open(const std::string &file) const; + PluginEntry open(const std::string &file, std::string *errorMsg = nullptr) const; bool findLibrary(void *handle) const; @@ -139,12 +142,14 @@ class SC_SYSTEM_CORE_API PluginRegistry { using PluginList = std::list; using PathList = std::vector; using NameList = std::vector; + using StringList = NameList; static PluginRegistry *_instance; PluginList _plugins; PathList _paths; NameList _pluginNames; + StringList _errors; }; diff --git a/lib/libseiscomp_core.so.17.0.0 b/lib/libseiscomp_core.so.17.0.0 index 5deea00..061bb90 100644 Binary files a/lib/libseiscomp_core.so.17.0.0 and b/lib/libseiscomp_core.so.17.0.0 differ diff --git a/lib/libseiscomp_qt.so.17.0.0 b/lib/libseiscomp_qt.so.17.0.0 index 494dc11..a36a2b9 100644 Binary files a/lib/libseiscomp_qt.so.17.0.0 and b/lib/libseiscomp_qt.so.17.0.0 differ diff --git a/lib/python/seiscomp/__pycache__/config.cpython-312.pyc b/lib/python/seiscomp/__pycache__/config.cpython-312.pyc deleted file mode 100644 index 1aed4ab..0000000 Binary files a/lib/python/seiscomp/__pycache__/config.cpython-312.pyc and /dev/null differ diff --git a/lib/python/seiscomp/__pycache__/kernel.cpython-312.pyc b/lib/python/seiscomp/__pycache__/kernel.cpython-312.pyc deleted file mode 100644 index 2d973a4..0000000 Binary files a/lib/python/seiscomp/__pycache__/kernel.cpython-312.pyc and /dev/null differ diff --git a/lib/python/seiscomp/_system.so b/lib/python/seiscomp/_system.so index ddecccb..9a02e3c 100644 Binary files a/lib/python/seiscomp/_system.so and b/lib/python/seiscomp/_system.so differ diff --git a/share/doc/scanloc/CHANGELOG b/share/doc/scanloc/CHANGELOG index 4da11c1..ffeff27 100644 --- a/share/doc/scanloc/CHANGELOG +++ b/share/doc/scanloc/CHANGELOG @@ -2,6 +2,15 @@ All notable changes to scanloc and add-ons will be documented in this file. +## 2025.296 + +## Fixed + +- Buffer access in S pick association. Until now, only S picks were taken into + account that were already processed by scanloc when checking for already + assigned S picks. This led to problems when an Origin was processed before + the picks were added to the internal buffers. + ## 2025.295 ## Fixed diff --git a/share/doc/scanloc/html/_sources/base/CHANGELOG.md.txt b/share/doc/scanloc/html/_sources/base/CHANGELOG.md.txt index 4da11c1..ffeff27 100644 --- a/share/doc/scanloc/html/_sources/base/CHANGELOG.md.txt +++ b/share/doc/scanloc/html/_sources/base/CHANGELOG.md.txt @@ -2,6 +2,15 @@ All notable changes to scanloc and add-ons will be documented in this file. +## 2025.296 + +## Fixed + +- Buffer access in S pick association. Until now, only S picks were taken into + account that were already processed by scanloc when checking for already + assigned S picks. This led to problems when an Origin was processed before + the picks were added to the internal buffers. + ## 2025.295 ## Fixed diff --git a/share/doc/scanloc/html/apps/global.html b/share/doc/scanloc/html/apps/global.html index 83c8155..93c6c31 100644 --- a/share/doc/scanloc/html/apps/global.html +++ b/share/doc/scanloc/html/apps/global.html @@ -24,7 +24,7 @@
scanloc: Phase Associator - 2025.295#8bb1059a0 + 2025.296#76adc9190
@@ -3170,7 +3170,7 @@ GUI applications.