Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
geomag-algorithms
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ghsc
National Geomagnetism Program
geomag-algorithms
Commits
431abaa7
Commit
431abaa7
authored
5 years ago
by
Jeremy M Fee
Browse files
Options
Downloads
Patches
Plain Diff
Remove unused code from MiniSeedFactory
parent
b95c5ba7
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
geomagio/edge/MiniSeedFactory.py
+2
-97
2 additions, 97 deletions
geomagio/edge/MiniSeedFactory.py
with
2 additions
and
97 deletions
geomagio/edge/MiniSeedFactory.py
+
2
−
97
View file @
431abaa7
...
@@ -59,16 +59,6 @@ class MiniSeedFactory(TimeseriesFactory):
...
@@ -59,16 +59,6 @@ class MiniSeedFactory(TimeseriesFactory):
locationCode: str
locationCode: str
the location code for the given edge server, overrides type
the location code for the given edge server, overrides type
in get_timeseries/put_timeseries
in get_timeseries/put_timeseries
cwbhost: str
a string represeting the IP number of the cwb host to connect to.
cwbport: int
the port number of the cwb host to connect to.
tag: str
A tag used by edge to log and associate a socket with a given data
source
forceout: bool
Tells edge to forceout a packet to miniseed. Generally used when
the user knows no more data is coming.
See Also
See Also
--------
--------
...
@@ -84,8 +74,7 @@ class MiniSeedFactory(TimeseriesFactory):
...
@@ -84,8 +74,7 @@ class MiniSeedFactory(TimeseriesFactory):
def
__init__
(
self
,
host
=
'
cwbpub.cr.usgs.gov
'
,
port
=
2061
,
write_port
=
7981
,
def
__init__
(
self
,
host
=
'
cwbpub.cr.usgs.gov
'
,
port
=
2061
,
write_port
=
7981
,
observatory
=
None
,
channels
=
None
,
type
=
None
,
interval
=
None
,
observatory
=
None
,
channels
=
None
,
type
=
None
,
interval
=
None
,
observatoryMetadata
=
None
,
locationCode
=
None
,
observatoryMetadata
=
None
,
locationCode
=
None
):
cwbhost
=
None
,
cwbport
=
0
,
tag
=
'
GeomagAlg
'
,
forceout
=
False
):
TimeseriesFactory
.
__init__
(
self
,
observatory
,
channels
,
type
,
interval
)
TimeseriesFactory
.
__init__
(
self
,
observatory
,
channels
,
type
,
interval
)
self
.
client
=
miniseed
.
Client
(
host
,
port
)
self
.
client
=
miniseed
.
Client
(
host
,
port
)
...
@@ -97,9 +86,6 @@ class MiniSeedFactory(TimeseriesFactory):
...
@@ -97,9 +86,6 @@ class MiniSeedFactory(TimeseriesFactory):
self
.
host
=
host
self
.
host
=
host
self
.
port
=
port
self
.
port
=
port
self
.
write_port
=
write_port
self
.
write_port
=
write_port
self
.
cwbhost
=
cwbhost
or
''
self
.
cwbport
=
cwbport
self
.
forceout
=
forceout
def
get_timeseries
(
self
,
starttime
,
endtime
,
observatory
=
None
,
def
get_timeseries
(
self
,
starttime
,
endtime
,
observatory
=
None
,
channels
=
None
,
type
=
None
,
interval
=
None
):
channels
=
None
,
type
=
None
,
interval
=
None
):
...
@@ -204,44 +190,6 @@ class MiniSeedFactory(TimeseriesFactory):
...
@@ -204,44 +190,6 @@ class MiniSeedFactory(TimeseriesFactory):
self
.
_put_channel
(
timeseries
,
observatory
,
channel
,
type
,
self
.
_put_channel
(
timeseries
,
observatory
,
channel
,
type
,
interval
,
starttime
,
endtime
)
interval
,
starttime
,
endtime
)
def
_convert_timeseries_to_decimal
(
self
,
stream
):
"""
convert geomag edge timeseries data stored as ints, to decimal by
dividing by 1000.00
Parameters
----------
stream : obspy.core.stream
a stream retrieved from a geomag edge representing one channel.
Notes
-----
This routine changes the values in the timeseries. The user should
make a copy before calling if they don
'
t want that side effect.
"""
for
trace
in
stream
:
trace
.
data
=
numpy
.
divide
(
trace
.
data
,
1000.00
)
def
_convert_trace_to_int
(
self
,
trace_in
):
"""
convert geomag edge traces stored as decimal, to ints by multiplying
by 1000
Parameters
----------
trace : obspy.core.trace
a trace retrieved from a geomag edge representing one channel.
Returns
-------
obspy.core.trace
a trace converted to ints
Notes
-----
this doesn
'
t work on ndarray with nan
'
s in it.
the trace must be a masked array.
"""
trace
=
trace_in
.
copy
()
trace
.
data
=
numpy
.
multiply
(
trace
.
data
,
1000.00
)
trace
.
data
=
trace
.
data
.
astype
(
int
)
return
trace
def
_convert_stream_to_masked
(
self
,
timeseries
,
channel
):
def
_convert_stream_to_masked
(
self
,
timeseries
,
channel
):
"""
convert geomag edge traces in a timeseries stream to a MaskedArray
"""
convert geomag edge traces in a timeseries stream to a MaskedArray
This allows for gaps and splitting.
This allows for gaps and splitting.
...
@@ -529,8 +477,6 @@ class MiniSeedFactory(TimeseriesFactory):
...
@@ -529,8 +477,6 @@ class MiniSeedFactory(TimeseriesFactory):
Notes: the original timeseries object is changed.
Notes: the original timeseries object is changed.
"""
"""
# miniseed uses floating point, and doesn't need conversion
# self._convert_timeseries_to_decimal(timeseries)
for
trace
in
timeseries
:
for
trace
in
timeseries
:
if
isinstance
(
trace
.
data
,
numpy
.
ma
.
MaskedArray
):
if
isinstance
(
trace
.
data
,
numpy
.
ma
.
MaskedArray
):
trace
.
data
.
set_fill_value
(
numpy
.
nan
)
trace
.
data
.
set_fill_value
(
numpy
.
nan
)
...
@@ -561,49 +507,8 @@ class MiniSeedFactory(TimeseriesFactory):
...
@@ -561,49 +507,8 @@ class MiniSeedFactory(TimeseriesFactory):
data interval.
data interval.
starttime: obspy.core.UTCDateTime
starttime: obspy.core.UTCDateTime
endtime: obspy.core.UTCDateTime
endtime: obspy.core.UTCDateTime
Notes
-----
RawInputClient seems to only work when sockets are
"""
"""
station
=
self
.
_get_edge_station
(
observatory
,
channel
,
raise
NotImplementedError
(
'"
_put_channel
"
not implemented
'
)
type
,
interval
)
location
=
self
.
_get_edge_location
(
observatory
,
channel
,
type
,
interval
)
network
=
self
.
_get_edge_network
(
observatory
,
channel
,
type
,
interval
)
edge_channel
=
self
.
_get_edge_channel
(
observatory
,
channel
,
type
,
interval
)
now
=
obspy
.
core
.
UTCDateTime
(
datetime
.
utcnow
())
if
((
now
-
endtime
)
>
864000
)
and
(
self
.
cwbport
>
0
):
host
=
self
.
cwbhost
port
=
self
.
cwbport
else
:
host
=
self
.
host
port
=
self
.
write_port
ric
=
RawInputClient
(
self
.
tag
,
host
,
port
,
station
,
edge_channel
,
location
,
network
)
stream
=
self
.
_convert_stream_to_masked
(
timeseries
=
timeseries
,
channel
=
channel
)
# Make certain there's actually data
if
not
numpy
.
ma
.
any
(
stream
.
select
(
channel
=
channel
)[
0
].
data
):
return
for
trace
in
stream
.
select
(
channel
=
channel
).
split
():
trace_send
=
trace
.
copy
()
trace_send
.
trim
(
starttime
,
endtime
)
if
channel
==
'
D
'
:
trace_send
.
data
=
ChannelConverter
.
get_minutes_from_radians
(
trace_send
.
data
)
trace_send
=
self
.
_convert_trace_to_int
(
trace_send
)
ric
.
send_trace
(
interval
,
trace_send
)
if
self
.
forceout
:
ric
.
forceout
()
ric
.
close
()
def
_set_metadata
(
self
,
stream
,
observatory
,
channel
,
type
,
interval
):
def
_set_metadata
(
self
,
stream
,
observatory
,
channel
,
type
,
interval
):
"""
set metadata for a given stream/channel
"""
set metadata for a given stream/channel
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment