Skip to content

[scautoloc] Add DepthLookup plugin support via factory interface #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
comoglu wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[scautoloc] Add DepthLookup plugin support via factory interface #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions apps/processing/scautoloc/app.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,11 @@ bool AutolocApp::initConfiguration() {
}
catch ( ... ) {}

try {
_config.depthLookupType = configGetString("autoloc.depthLookup");
}
catch ( ... ) {}

try {
_config.maxResidualUse = configGetDouble("autoloc.maxResidual");
}
Expand Down
46 changes: 36 additions & 10 deletions apps/processing/scautoloc/autoloc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,33 @@ bool Autoloc::init() {
SEISCOMP_DEBUG("Setting configured locator profile: %s", _config.locatorProfile);
setLocatorProfile(_config.locatorProfile);

_depthLookup = Seismology::DepthLookupFactory::Create(_config.depthLookupType);
if ( !_depthLookup ) {
if ( _config.depthLookupType != "Constant" )
SEISCOMP_WARNING("DepthLookup '%s' not available — falling back to Constant",
_config.depthLookupType.c_str());
_depthLookup = Seismology::DepthLookupFactory::Create("Constant");
}
if ( _depthLookup && _config.scconfig )
_depthLookup->init(*_config.scconfig);

return true; // ready to start processing
}


// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
double Autoloc::_defaultDepthAt(const Origin *origin) const {
return _depthLookup
? _depthLookup->fetch(origin->hypocenter.lat, origin->hypocenter.lon)
: _config.defaultDepth;
}

double Autoloc::_maxDepthAt(const Origin *origin) const {
return _depthLookup
? _depthLookup->fetchMaxDepth(origin->hypocenter.lat, origin->hypocenter.lon)
: _config.maxDepth;
}
// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<


Expand Down Expand Up @@ -1879,7 +1904,7 @@ bool Autoloc::_setDefaultDepth(Origin *origin)
{
OriginPtr test = new Origin(*origin);

_relocator.setFixedDepth(_config.defaultDepth);
_relocator.setFixedDepth(_defaultDepthAt(origin));
_relocator.useFixedDepth(true);
OriginPtr relo = _relocator.relocate(test.get());
if ( !relo ) {
Expand Down Expand Up @@ -1920,7 +1945,8 @@ bool Autoloc::_setTheRightDepth(Origin *origin) {
return false;
}

double radius = 5*(relo->hypocenter.dep >= _config.defaultDepth ? relo->hypocenter.dep : _config.defaultDepth)/111.2;
double dd = _defaultDepthAt(origin);
double radius = 5*(relo->hypocenter.dep >= dd ? relo->hypocenter.dep : dd)/111.2;

// XXX This is a hack, but better than nothing:
// if there are at least 2 stations within 5 times the source depth, we assume sufficient depth resolution.
Expand Down Expand Up @@ -2110,7 +2136,7 @@ bool Autoloc::_rework(Origin *origin) {
}

if ( enforceDefaultDepth ) {
_relocator.setFixedDepth(_config.defaultDepth);
_relocator.setFixedDepth(_defaultDepthAt(origin));
}

bool keepDepth = adoptManualDepth || enforceDefaultDepth;
Expand Down Expand Up @@ -2159,7 +2185,7 @@ bool Autoloc::_rework(Origin *origin) {
_excludeDistantStations(origin);
_excludePKP(origin);

if ( origin->hypocenter.dep != _config.defaultDepth && origin->depthType == Origin::DepthDefault )
if ( origin->hypocenter.dep != _defaultDepthAt(origin) && origin->depthType == Origin::DepthDefault )
origin->depthType = Origin::DepthFree;

// once more (see also above)
Expand Down Expand Up @@ -2391,9 +2417,9 @@ bool Autoloc::_publishable(const Origin *origin) const
}


if ( origin->hypocenter.dep > _config.maxDepth ) {
if ( origin->hypocenter.dep > _maxDepthAt(origin) ) {
SEISCOMP_INFO("Origin %ld too deep: %.1f km > %.1f km (maxDepth)",
origin->id, origin->hypocenter.dep, _config.maxDepth);
origin->id, origin->hypocenter.dep, _maxDepthAt(origin));
return false;
}

Expand Down Expand Up @@ -2443,7 +2469,7 @@ bool Autoloc::_store(Origin *origin)
}

if ( origin->depthType == Origin::DepthDefault &&
origin->hypocenter.dep != _config.defaultDepth ) {
origin->hypocenter.dep != _defaultDepthAt(origin) ) {
origin->depthType = Origin::DepthFree;
}

Expand Down Expand Up @@ -2537,7 +2563,7 @@ bool Autoloc::_associate(Origin *origin, const Pick *pick, const std::string &ph
bool fixed = false;
if ( _config.defaultDepthStickiness > 0.9 ) {
fixed = true;
_relocator.setFixedDepth(_config.defaultDepth);
_relocator.setFixedDepth(_defaultDepthAt(origin));
}

// else if ( origin->depthType == Origin::DepthManuallyFixed || origin->depthType == Origin::DepthPhases ) {
Expand Down Expand Up @@ -3528,7 +3554,7 @@ bool Autoloc::_depthIsResolvable(Origin *origin) {
// return true;
// }

if ( origin->depthType == Origin::DepthDefault && origin->hypocenter.dep != _config.defaultDepth )
if ( origin->depthType == Origin::DepthDefault && origin->hypocenter.dep != _defaultDepthAt(origin) )
origin->depthType = Origin::DepthFree;

OriginPtr test = new Origin(*origin);
Expand All @@ -3547,7 +3573,7 @@ bool Autoloc::_depthIsResolvable(Origin *origin) {
}

test = new Origin(*origin);
test->hypocenter.dep = _config.defaultDepth;
test->hypocenter.dep = _defaultDepthAt(origin);
_relocator.useFixedDepth(true);
relo = _relocator.relocate(test.get());
if ( !relo ) {
Expand Down
7 changes: 7 additions & 0 deletions apps/processing/scautoloc/autoloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
#include <map>
#include <set>

#include <seiscomp/seismology/depthlookup.h>

#include "datamodel.h"
#include "nucleator.h"
#include "associator.h"
Expand Down Expand Up @@ -262,6 +264,9 @@ class Autoloc {
// if successful, true is returned, otherwise false
bool _setDefaultDepth(AutolocInternal::Origin*);

double _defaultDepthAt(const AutolocInternal::Origin*) const;
double _maxDepthAt(const AutolocInternal::Origin*) const;

// Attempt to decide whether the focal depth can be resolved considering
// the station distribution. Returns true if resolvable, false if not.
bool _depthIsResolvable(AutolocInternal::Origin*);
Expand Down Expand Up @@ -365,6 +370,8 @@ class Autoloc {
AutolocConfig _config;
AutolocInternal::StationConfig _stationConfig;

Seismology::DepthLookupPtr _depthLookup;

const Seiscomp::Config::Config *scconfig {nullptr};
const Seiscomp::DataModel::Inventory *scinventory {nullptr};
// Seiscomp::DataModel::InventoryPtr inventory;
Expand Down
1 change: 1 addition & 0 deletions apps/processing/scautoloc/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ void AutolocConfig::dump() const {
SEISCOMP_INFO(" maxResidual %.1f s", maxResidualUse);
SEISCOMP_INFO(" maxResidual for keeping picks %.1f s", maxResidualKeep);
SEISCOMP_INFO(" minPhaseCount %d", minPhaseCount);
SEISCOMP_INFO(" depthLookup %s", depthLookupType.c_str());
SEISCOMP_INFO(" maxDepth %.1f km", maxDepth);
SEISCOMP_INFO(" minStaCountIgnorePKP %d", minStaCountIgnorePKP);
SEISCOMP_INFO(" defaultDepthStickiness %g", defaultDepthStickiness);
Expand Down
4 changes: 4 additions & 0 deletions apps/processing/scautoloc/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ struct AutolocConfig {
// maxResidualUse = 2*maxRMS


// DepthLookup backend: "Constant" (default), or any registered plugin
// e.g. "Slab2" when slab2depthlookup plugin is loaded.
std::string depthLookupType{"Constant"};

// Use this depth if there is no depth resolution
double defaultDepth{10.0}; // unit: km
double defaultDepthStickiness{0.5}; // 0...1
Expand Down