Skip to content

Version 0.1.0 #26

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.

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

Merged
merged 4 commits into from
Mar 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 24 additions & 7 deletions docs/scripts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,30 @@ Usage
catalogue. Options include: BGR, ETH, GEONET, GFZ,
INGV, IPGP, IRIS, KOERI, LMU, NCEDC, NEIP, NERIES,
ODC, ORFEUS, RESIF, SCEDC, USGS, USP. [Default IRIS]
--cat_url CAT_URL Specify the obspy base_url server address (and port if
needed) to open for the catalogue client. Overrides
any settings to cat_client. [Default None]
--waveform-source WF_CLIENT
Specify the server to connect to for the waveform
data. Options include: BGR, ETH, GEONET, GFZ, INGV,
IPGP, IRIS, KOERI, LMU, NCEDC, NEIP, NERIES, ODC,
ORFEUS, RESIF, SCEDC, USGS, USP. [Default IRIS]
-U USERAUTH, --User-Auth USERAUTH
--wf_url WF_URL Specify the obspy base_url server address (and port if
needed) to open for the waveform client. Overrides any
settings to wf_client. [Default None]
-U USERAUTH, --user-auth USERAUTH
Enter your Authentification Username and Password for
the waveform server (--User-
Auth='username:authpassword') to access and download
the waveform server (--user-
auth='username:authpassword') to access and download
restricted data. [Default no user and password]

Station Selection Parameters:
Parameters to select a specific station.

--keys STKEYS Specify list of Station Keys in the database to
process.
--zcomp ZCOMP Specify the Vertical Component Channel Identifier.
[Default Z].
-c NAMECONV, --coord-system NAMECONV
Coordinate system specification of instrument. (0)
Attempt Autodetect between 1 and 2; (1) HZ, HN, HE;
Expand Down Expand Up @@ -278,27 +286,36 @@ Usage
catalogue. Options include: BGR, ETH, GEONET, GFZ,
INGV, IPGP, IRIS, KOERI, LMU, NCEDC, NEIP, NERIES,
ODC, ORFEUS, RESIF, SCEDC, USGS, USP. [Default IRIS]
--cat_url CAT_URL Specify the obspy base_url server address (and port if
needed) to open for the catalogue client. Overrides
any settings to cat_client. [Default None]
--waveform-source WF_CLIENT
Specify the server to connect to for the waveform
data. Options include: BGR, ETH, GEONET, GFZ, INGV,
IPGP, IRIS, KOERI, LMU, NCEDC, NEIP, NERIES, ODC,
ORFEUS, RESIF, SCEDC, USGS, USP. [Default IRIS]
-U USERAUTH, --User-Auth USERAUTH
--wf_url WF_URL Specify the obspy base_url server address (and port if
needed) to open for the waveform client. Overrides any
settings to wf_client. [Default None]
-U USERAUTH, --user-auth USERAUTH
Enter your Authentification Username and Password for
the waveform server (--User-
Auth='username:authpassword') to access and download
the waveform server (--user-
auth='username:authpassword') to access and download
restricted data. [Default no user and password]

Station Selection Parameters:
Parameters to select a specific station.

--keys STKEYS Specify list of Station Keys in the database to
process.
--zcomp ZCOMP Specify the Vertical Component Channel Identifier.
[Default Z].
-c NAMECONV, --coord-system NAMECONV
Coordinate system specification of instrument. (0)
Attempt Autodetect between 1 and 2; (1) HZ, HN, HE;
(2) Left Handed: HZ, H2 90 CW H1; (3) Right Handed:
HZ, H2 90 CCW H1. [Default 2]
HZ, H2 90 CCW H1 (4) Left Handed Numeric: H3, H2 90 CW
H1 [Default 2]

Timing Parameters:
Parameters associated with event timing and window length.
Expand Down
2 changes: 1 addition & 1 deletion orientpy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '0.0.2'
__version__ = '0.1.0'

__author__ = 'Pascal Audet'

Expand Down
26 changes: 13 additions & 13 deletions orientpy/scripts/bng_calc_auto.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@ def get_bng_calc_arguments(argv=None):
"[Default None]")
Svparm.add_argument(
"-U",
"--User-Auth",
"--user-auth",
action="store",
type=str,
dest="UserAuth",
dest="userauth",
default="",
help="Enter your Authentification Username and Password for the " +
"waveform server (--User-Auth='username:authpassword') to access " +
"waveform server (--user-auth='username:authpassword') to access " +
"and download restricted data. [Default no user and password]")

# Station Selection Parameters
Expand All @@ -155,7 +155,7 @@ def get_bng_calc_arguments(argv=None):
default="",
help="Specify list of Station Keys in the database to process.")
stparm.add_argument(
"--Zcomp",
"--zcomp",
dest="zcomp",
type=str,
default='Z',
Expand Down Expand Up @@ -320,16 +320,16 @@ def get_bng_calc_arguments(argv=None):
args.endT = None

# Parse User Authentification
if not len(args.UserAuth) == 0:
tt = args.UserAuth.split(':')
if not len(args.userauth) == 0:
tt = args.userauth.split(':')
if not len(tt) == 2:
parser.error(
"Error: Incorrect Username and Password Strings " +
"for User Authentification")
else:
args.UserAuth = tt
args.userauth = tt
else:
args.UserAuth = []
args.userauth = []

# Parse Local Data directories
if len(args.localdata) > 0:
Expand Down Expand Up @@ -396,20 +396,20 @@ def main(args=None):
# Establish client for waveforms
if args.verb > 1:
print(" Establishing Waveform Client...")
if len(args.UserAuth) == 0:
if len(args.userauth) == 0:
if args.wf_url is not None:
wf_client = Client(base_url=args.wf_url)
else:
wf_client = Client(args.wf_client)
else:
if args.wf_url is not None:
wf_client = Client(base_url=args.wf_url,
user=args.UserAuth[0],
password=args.UserAuth[1])
user=args.userauth[0],
password=args.userauth[1])
else:
wf_client = Client(args.wf_client,
user=args.UserAuth[0],
password=args.UserAuth[1])
user=args.userauth[0],
password=args.userauth[1])
if args.verb > 1:
print(" Done")
print(" ")
Expand Down
26 changes: 13 additions & 13 deletions orientpy/scripts/dl_calc.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@ def get_dl_calc_arguments(argv=None):
"[Default None]")
Svparm.add_argument(
"-U",
"--User-Auth",
"--user-auth",
action="store",
type=str,
dest="UserAuth",
dest="userauth",
default="",
help="Enter your Authentification Username and Password for the " +
"waveform server (--User-Auth='username:authpassword') to access " +
"waveform server (--user-auth='username:authpassword') to access " +
"and download restricted data. [Default no user and password]")

# Station Selection Parameters
Expand All @@ -155,7 +155,7 @@ def get_dl_calc_arguments(argv=None):
default="",
help="Specify list of Station Keys in the database to process.")
stparm.add_argument(
"--Zcomp",
"--zcomp",
dest="zcomp",
type=str,
default='Z',
Expand Down Expand Up @@ -276,16 +276,16 @@ def get_dl_calc_arguments(argv=None):
args.endT = None

# Parse User Authentification
if not len(args.UserAuth) == 0:
tt = args.UserAuth.split(':')
if not len(args.userauth) == 0:
tt = args.userauth.split(':')
if not len(tt) == 2:
parser.error(
"Error: Incorrect Username and Password Strings " +
"for User Authentification")
else:
args.UserAuth = tt
args.userauth = tt
else:
args.UserAuth = []
args.userauth = []

# Parse Local Data directories
if len(args.localdata) > 0:
Expand Down Expand Up @@ -334,20 +334,20 @@ def main(args=None):
# Establish client for waveforms
if args.verb > 1:
print(" Establishing Waveform Client...")
if len(args.UserAuth) == 0:
if len(args.userauth) == 0:
if args.wf_url is not None:
wf_client = Client(base_url=args.wf_url)
else:
wf_client = Client(args.wf_client)
else:
if args.wf_url is not None:
wf_client = Client(base_url=args.wf_url,
user=args.UserAuth[0],
password=args.UserAuth[1])
user=args.userauth[0],
password=args.userauth[1])
else:
wf_client = Client(args.wf_client,
user=args.UserAuth[0],
password=args.UserAuth[1])
user=args.userauth[0],
password=args.userauth[1])
if args.verb > 1:
print(" Done")
print(" ")
Expand Down
Loading