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
863f95e5
Commit
863f95e5
authored
10 months ago
by
Erin (Josh) Rigler
Browse files
Options
Downloads
Plain Diff
Merge branch 'Variometer_API_Additions' into 'master'
Variometer api additions See merge request
!327
parents
7748845d
b46bdec8
No related branches found
No related tags found
1 merge request
!327
Variometer api additions
Pipeline
#436247
failed
9 months ago
Stage: init
Stage: test
Stage: integration
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
geomagio/api/db/MetadataDatabaseFactory.py
+1
-1
1 addition, 1 deletion
geomagio/api/db/MetadataDatabaseFactory.py
geomagio/edge/FDSNSNCL.py
+2
-2
2 additions, 2 deletions
geomagio/edge/FDSNSNCL.py
with
3 additions
and
3 deletions
geomagio/api/db/MetadataDatabaseFactory.py
+
1
−
1
View file @
863f95e5
...
@@ -44,7 +44,7 @@ class MetadataDatabaseFactory(object):
...
@@ -44,7 +44,7 @@ class MetadataDatabaseFactory(object):
location
,
location
,
data_valid
,
data_valid
,
status
,
status
,
metadata
metadata
,
)
=
params
.
datetime_dict
().
values
()
)
=
params
.
datetime_dict
().
values
()
if
id
:
if
id
:
query
=
query
.
where
(
table
.
c
.
id
==
id
)
query
=
query
.
where
(
table
.
c
.
id
==
id
)
...
...
This diff is collapsed.
Click to expand it.
geomagio/edge/FDSNSNCL.py
+
2
−
2
View file @
863f95e5
...
@@ -72,9 +72,9 @@ def get_FDSN_channel(
...
@@ -72,9 +72,9 @@ def get_FDSN_channel(
def
_get_channel_end
(
element
:
str
)
->
str
:
def
_get_channel_end
(
element
:
str
)
->
str
:
if
element
in
[
"
H
"
,
"
U
"
]:
if
element
in
[
"
H
"
,
"
U
"
,
"
X
"
]:
return
"
F2
"
return
"
F2
"
elif
element
in
[
"
E
"
,
"
V
"
]:
elif
element
in
[
"
E
"
,
"
V
"
,
"
Y
"
]:
return
"
F1
"
return
"
F1
"
elif
element
in
[
"
Z
"
,
"
W
"
]:
elif
element
in
[
"
Z
"
,
"
W
"
]:
return
"
FZ
"
return
"
FZ
"
...
...
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