Skip to content

Commit

Permalink
Replace absolute imports with relative imports
Browse files Browse the repository at this point in the history
This allows for actually using "sourcespec2"
modules instead of "sourcespec" modules.
  • Loading branch information
claudiodsf committed Jul 3, 2024
1 parent 58927c5 commit 2d61e69
Show file tree
Hide file tree
Showing 28 changed files with 106 additions and 106 deletions.
22 changes: 11 additions & 11 deletions sourcespec2/source_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ def make_synth(config, spec_st, trace_spec=None):
import math
import numpy as np
from copy import deepcopy
from sourcespec.spectrum import Spectrum
from sourcespec.ssp_spectral_model import spectral_model, objective_func
from sourcespec.ssp_util import mag_to_moment, moment_to_mag
from .spectrum import Spectrum
from .ssp_spectral_model import spectral_model, objective_func
from .ssp_util import mag_to_moment, moment_to_mag
fdelta = 0.01
fmin = config.options.fmin
fmax = config.options.fmax + fdelta
Expand Down Expand Up @@ -82,9 +82,9 @@ def main():
"""
# pylint: disable=import-outside-toplevel
# Lazy-import modules for speed
from sourcespec.ssp_parse_arguments import parse_args
from .ssp_parse_arguments import parse_args
options = parse_args(progname='source_model')
from sourcespec.ssp_setup import configure, ssp_exit
from .ssp_setup import configure, ssp_exit
plot_show = bool(options.plot)
conf_overrides = {
'plot_show': plot_show,
Expand All @@ -93,10 +93,10 @@ def main():
}
config = configure(
options, progname='source_model', config_overrides=conf_overrides)
from sourcespec.spectrum import SpectrumStream
from sourcespec.ssp_read_traces import read_traces
from sourcespec.ssp_process_traces import process_traces
from sourcespec.ssp_build_spectra import build_spectra
from .spectrum import SpectrumStream
from .ssp_read_traces import read_traces
from .ssp_process_traces import process_traces
from .ssp_build_spectra import build_spectra

# We don't use weighting in source_model
config.weighting = 'no_weight'
Expand All @@ -121,8 +121,8 @@ def main():
spec_st = SpectrumStream()
make_synth(config, spec_st)

from sourcespec.ssp_plot_spectra import plot_spectra
from sourcespec.ssp_plot_traces import plot_traces
from .ssp_plot_spectra import plot_spectra
from .ssp_plot_traces import plot_traces
plot_traces(config, proc_st, ncols=2, block=False)
plot_spectra(config, spec_st, ncols=1, stack_plots=True)

Expand Down
8 changes: 4 additions & 4 deletions sourcespec2/source_residuals.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
from argparse import ArgumentParser
import matplotlib
import matplotlib.pyplot as plt
from sourcespec._version import get_versions
from sourcespec.spectrum import read_spectra
from sourcespec.ssp_util import moment_to_mag, mag_to_moment
from sourcespec.spectrum import SpectrumStream
from ._version import get_versions
from .spectrum import read_spectra
from .ssp_util import moment_to_mag, mag_to_moment
from .spectrum import SpectrumStream
matplotlib.use('Agg') # NOQA


Expand Down
34 changes: 17 additions & 17 deletions sourcespec2/source_spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ def main():
"""Main routine for source_spec."""
# pylint: disable=import-outside-toplevel
# Lazy-import modules for speed
from sourcespec.ssp_parse_arguments import parse_args
from .ssp_parse_arguments import parse_args
options = parse_args(progname='source_spec')

# Setup stage
from sourcespec.ssp_setup import (
from .ssp_setup import (
configure, move_outdir, remove_old_outdir, setup_logging,
save_config, ssp_exit)
config = configure(options, progname='source_spec')
setup_logging(config)

from sourcespec.ssp_read_traces import read_traces
from .ssp_read_traces import read_traces
st = read_traces(config)

# Now that we have an evid, we can rename the outdir and the log file
Expand All @@ -43,58 +43,58 @@ def main():
save_config(config)

# Deconvolve, filter, cut traces:
from sourcespec.ssp_process_traces import process_traces
from .ssp_process_traces import process_traces
proc_st = process_traces(config, st)

# Build spectra (amplitude in magnitude units)
from sourcespec.ssp_build_spectra import build_spectra
from .ssp_build_spectra import build_spectra
spec_st, specnoise_st, weight_st = build_spectra(config, proc_st)

from sourcespec.ssp_plot_traces import plot_traces
from .ssp_plot_traces import plot_traces
plot_traces(config, proc_st)

# Spectral inversion
from sourcespec.ssp_inversion import spectral_inversion
from .ssp_inversion import spectral_inversion
sspec_output = spectral_inversion(config, spec_st, weight_st)

# Radiated energy and apparent stress
from sourcespec.ssp_radiated_energy import (
from .ssp_radiated_energy import (
radiated_energy_and_apparent_stress)
radiated_energy_and_apparent_stress(
config, spec_st, specnoise_st, sspec_output)

# Local magnitude
if config.compute_local_magnitude:
from sourcespec.ssp_local_magnitude import local_magnitude
from .ssp_local_magnitude import local_magnitude
local_magnitude(config, st, proc_st, sspec_output)

# Compute summary statistics from station spectral parameters
from sourcespec.ssp_summary_statistics import compute_summary_statistics
from .ssp_summary_statistics import compute_summary_statistics
compute_summary_statistics(config, sspec_output)

# Save output
from sourcespec.ssp_output import write_output, save_spectra
from .ssp_output import write_output, save_spectra
write_output(config, sspec_output)
save_spectra(config, spec_st)

# Save residuals
from sourcespec.ssp_residuals import spectral_residuals
from .ssp_residuals import spectral_residuals
spectral_residuals(config, spec_st, sspec_output)

# Plotting
from sourcespec.ssp_plot_spectra import plot_spectra
from .ssp_plot_spectra import plot_spectra
plot_spectra(config, spec_st, specnoise_st, plot_type='regular')
plot_spectra(config, weight_st, plot_type='weight')
from sourcespec.ssp_plot_stacked_spectra import plot_stacked_spectra
from .ssp_plot_stacked_spectra import plot_stacked_spectra
plot_stacked_spectra(config, spec_st, weight_st, sspec_output)
from sourcespec.ssp_plot_params_stats import box_plots
from .ssp_plot_params_stats import box_plots
box_plots(config, sspec_output)
if config.plot_station_map:
from sourcespec.ssp_plot_stations import plot_stations
from .ssp_plot_stations import plot_stations
plot_stations(config, sspec_output)

if config.html_report:
from sourcespec.ssp_html_report import html_report
from .ssp_html_report import html_report
html_report(config, sspec_output)

ssp_exit()
Expand Down
12 changes: 6 additions & 6 deletions sourcespec2/ssp_build_spectra.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
from scipy.integrate import cumtrapz
from scipy.interpolate import interp1d
from obspy.core import Stream
from sourcespec.spectrum import Spectrum, SpectrumStream
from sourcespec.ssp_setup import ssp_exit
from sourcespec.ssp_util import (
from .spectrum import Spectrum, SpectrumStream
from .ssp_setup import ssp_exit
from .ssp_util import (
smooth, cosine_taper, moment_to_mag, MediumProperties,
geom_spread_r_power_n, geom_spread_boatwright, geom_spread_teleseismic)
from sourcespec.ssp_process_traces import filter_trace
from sourcespec.ssp_correction import station_correction
from sourcespec.ssp_radiation_pattern import get_radiation_pattern_coefficient
from .ssp_process_traces import filter_trace
from .ssp_correction import station_correction
from .ssp_radiation_pattern import get_radiation_pattern_coefficient
logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])


Expand Down
6 changes: 3 additions & 3 deletions sourcespec2/ssp_correction.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"""
import logging
from scipy.interpolate import interp1d
from sourcespec.spectrum import read_spectra
from sourcespec.ssp_util import moment_to_mag, mag_to_moment
from sourcespec.ssp_setup import ssp_exit
from .spectrum import read_spectra
from .ssp_util import moment_to_mag, mag_to_moment
from .ssp_setup import ssp_exit
logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])


Expand Down
4 changes: 2 additions & 2 deletions sourcespec2/ssp_grid_sampling.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
# pylint: disable=no-name-in-module
from scipy.signal._peak_finding_utils import PeakPropertyWarning
import matplotlib.pyplot as plt
from sourcespec.kdtree import KDTree
from sourcespec.savefig import savefig
from .kdtree import KDTree
from .savefig import savefig
logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])


Expand Down
4 changes: 2 additions & 2 deletions sourcespec2/ssp_html_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import contextlib
from urllib.parse import urlparse
import numpy as np
from sourcespec._version import get_versions
from sourcespec.ssp_data_types import SpectralParameter
from ._version import get_versions
from .ssp_data_types import SpectralParameter
logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])
VALID_FIGURE_FORMATS = ('.png', '.svg')

Expand Down
10 changes: 5 additions & 5 deletions sourcespec2/ssp_inversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
from scipy.optimize import curve_fit, minimize, basinhopping
from scipy.signal import argrelmax
from obspy.geodetics import gps2dist_azimuth
from sourcespec.spectrum import SpectrumStream
from sourcespec.ssp_spectral_model import (
from .spectrum import SpectrumStream
from .ssp_spectral_model import (
spectral_model, objective_func, callback)
from sourcespec.ssp_util import (
from .ssp_util import (
mag_to_moment, source_radius, static_stress_drop, quality_factor,
select_trace, smooth)
from sourcespec.ssp_data_types import (
from .ssp_data_types import (
InitialValues, Bounds, SpectralParameter, StationParameters,
SourceSpecOutput)
from sourcespec.ssp_grid_sampling import GridSampling
from .ssp_grid_sampling import GridSampling
logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])


Expand Down
6 changes: 3 additions & 3 deletions sourcespec2/ssp_local_magnitude.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
from obspy.signal.invsim import WOODANDERSON
from obspy.signal.util import smooth
from obspy.signal.trigger import trigger_onset
from sourcespec.ssp_data_types import SpectralParameter
from sourcespec.ssp_util import cosine_taper
from sourcespec.ssp_util import remove_instr_response
from .ssp_data_types import SpectralParameter
from .ssp_util import cosine_taper
from .ssp_util import remove_instr_response
logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])


Expand Down
6 changes: 3 additions & 3 deletions sourcespec2/ssp_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
from datetime import datetime
from tzlocal import get_localzone
import numpy as np
from sourcespec.ssp_qml_output import write_qml
from sourcespec.ssp_sqlite_output import write_sqlite
from sourcespec._version import get_versions
from .ssp_qml_output import write_qml
from .ssp_sqlite_output import write_sqlite
from ._version import get_versions
logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])


Expand Down
2 changes: 1 addition & 1 deletion sourcespec2/ssp_parse_arguments.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import sys
from argparse import ArgumentParser, RawTextHelpFormatter
from itertools import zip_longest
from sourcespec._version import get_versions
from ._version import get_versions


def _parse_values(value_str):
Expand Down
4 changes: 2 additions & 2 deletions sourcespec2/ssp_plot_params_stats.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import matplotlib.pyplot as plt
import matplotlib.patheffects as mpe

from sourcespec._version import get_versions
from sourcespec.savefig import savefig
from ._version import get_versions
from .savefig import savefig
logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])
# Reduce logging level for Matplotlib to avoid DEBUG messages
mpl_logger = logging.getLogger('matplotlib')
Expand Down
6 changes: 3 additions & 3 deletions sourcespec2/ssp_plot_spectra.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
import matplotlib.pyplot as plt
from matplotlib.backends.backend_pdf import PdfPages
import matplotlib.patheffects as PathEffects
from sourcespec.ssp_util import spec_minmax, moment_to_mag, mag_to_moment
from sourcespec.savefig import savefig
from sourcespec._version import get_versions
from .ssp_util import spec_minmax, moment_to_mag, mag_to_moment
from .savefig import savefig
from ._version import get_versions
logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])
# Reduce logging level for Matplotlib to avoid DEBUG messages
mpl_logger = logging.getLogger('matplotlib')
Expand Down
8 changes: 4 additions & 4 deletions sourcespec2/ssp_plot_stacked_spectra.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
import matplotlib.pyplot as plt
import matplotlib.patheffects as PathEffects
from matplotlib.collections import LineCollection
from sourcespec.ssp_util import moment_to_mag, mag_to_moment
from sourcespec.ssp_spectral_model import spectral_model
from sourcespec.savefig import savefig
from sourcespec._version import get_versions
from .ssp_util import moment_to_mag, mag_to_moment
from .ssp_spectral_model import spectral_model
from .savefig import savefig
from ._version import get_versions
logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])
# Reduce logging level for Matplotlib to avoid DEBUG messages
mpl_logger = logging.getLogger('matplotlib')
Expand Down
10 changes: 5 additions & 5 deletions sourcespec2/ssp_plot_stations.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
from matplotlib import colors
import matplotlib.patheffects as PathEffects
from mpl_toolkits.axes_grid1.axes_divider import make_axes_locatable
from sourcespec.adjustText import adjust_text
from sourcespec.cached_tiler import CachedTiler
from sourcespec.map_tiles import (
from .adjustText import adjust_text
from .cached_tiler import CachedTiler
from .map_tiles import (
EsriHillshade,
EsriHillshadeDark,
EsriOcean,
EsriImagery,
StamenTerrain,
)
from sourcespec.savefig import savefig
from sourcespec._version import get_versions
from .savefig import savefig
from ._version import get_versions
logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])
# Reduce logging level for Matplotlib to avoid DEBUG messages
mpl_logger = logging.getLogger('matplotlib')
Expand Down
4 changes: 2 additions & 2 deletions sourcespec2/ssp_plot_traces.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
from matplotlib import patches
import matplotlib.patheffects as PathEffects
from matplotlib.ticker import ScalarFormatter as sf
from sourcespec.savefig import savefig
from sourcespec._version import get_versions
from .savefig import savefig
from ._version import get_versions
logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])
# Reduce logging level for Matplotlib to avoid DEBUG messages
mpl_logger = logging.getLogger('matplotlib')
Expand Down
8 changes: 4 additions & 4 deletions sourcespec2/ssp_process_traces.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
from scipy.signal import savgol_filter
from obspy.core import Stream
from obspy.core.util import AttribDict
from sourcespec.ssp_setup import ssp_exit
from sourcespec.ssp_util import (
from .ssp_setup import ssp_exit
from .ssp_util import (
remove_instr_response, station_to_event_position)
from sourcespec.ssp_wave_arrival import add_arrival_to_trace
from sourcespec.clipping_detection import (
from .ssp_wave_arrival import add_arrival_to_trace
from .clipping_detection import (
compute_clipping_score, clipping_peaks)
logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])

Expand Down
2 changes: 1 addition & 1 deletion sourcespec2/ssp_qml_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
MomentTensor, QuantityError, ResourceIdentifier,
StationMagnitude, StationMagnitudeContribution,
WaveformStreamID)
from sourcespec._version import get_versions
from ._version import get_versions
logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])


Expand Down
2 changes: 1 addition & 1 deletion sourcespec2/ssp_radiated_energy.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import contextlib
import logging
import numpy as np
from sourcespec.ssp_data_types import SpectralParameter
from .ssp_data_types import SpectralParameter
logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])


Expand Down
6 changes: 3 additions & 3 deletions sourcespec2/ssp_read_event_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
import yaml
from obspy import UTCDateTime
from obspy import read_events
from sourcespec.ssp_setup import ssp_exit, TRACEID_MAP
from sourcespec.ssp_event import SSPEvent
from sourcespec.ssp_pick import SSPPick
from .ssp_setup import ssp_exit, TRACEID_MAP
from .ssp_event import SSPEvent
from .ssp_pick import SSPPick
logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])


Expand Down
Loading

0 comments on commit 2d61e69

Please sign in to comment.