Skip to content
Snippets Groups Projects
Commit 093e279d authored by Erin (Josh) Rigler's avatar Erin (Josh) Rigler
Browse files

Merge branch 'Convert-FRD-to-FGESensor' into 'master' 

Convert frd to fge sensor

See merge request !251
parents 73815eb5 1be158b2
No related branches found
Tags 1.7.6
1 merge request!251Convert frd to fge sensor
Pipeline #308130 passed
Stage: init
Stage: test
Stage: integration
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 101 additions and 19 deletions
geomagio/Metadata.py
+ 101
− 19
View file @ 093e279d
...@@ -39,7 +39,6 @@ _INSTRUMENT_METADATA = [ ...@@ -39,7 +39,6 @@ _INSTRUMENT_METADATA = [
"channels": { "channels": {
# each channel maps to a list of components to calculate nT # each channel maps to a list of components to calculate nT
# TODO: calculate these lists based on "FGE" type # TODO: calculate these lists based on "FGE" type
# TODO: Adjust offset for new FGE sensor & electronics? (installed 3/20/22)
"U": [{"channel": "U_Volt", "offset": 20613, "scale": 966.7624}], "U": [{"channel": "U_Volt", "offset": 20613, "scale": 966.7624}],
"V": [{"channel": "V_Volt", "offset": 0, "scale": 944.1253}], "V": [{"channel": "V_Volt", "offset": 0, "scale": 944.1253}],
"W": [{"channel": "W_Volt", "offset": 47450, "scale": 975.5875}], "W": [{"channel": "W_Volt", "offset": 47450, "scale": 975.5875}],
...@@ -55,7 +54,6 @@ _INSTRUMENT_METADATA = [ ...@@ -55,7 +54,6 @@ _INSTRUMENT_METADATA = [
"sensor": { "sensor": {
"serial": "S0449", "serial": "S0449",
# these constants combine with instrument setting for offset # these constants combine with instrument setting for offset
# Temporary values until actuals are obtained.
"x-constant": 37027, # nT/mA "x-constant": 37027, # nT/mA
"y-constant": 36160, # nT/mA "y-constant": 36160, # nT/mA
"z-constant": 37365, # nT/mA "z-constant": 37365, # nT/mA
...@@ -283,20 +281,28 @@ _INSTRUMENT_METADATA = [ ...@@ -283,20 +281,28 @@ _INSTRUMENT_METADATA = [
"start_time": None, "start_time": None,
"end_time": None, "end_time": None,
"instrument": { "instrument": {
"type": "Narod", "type": "FGE",
"channels": { "channels": {
"U": [ # each channel maps to a list of components to calculate nT
{"channel": "U_Volt", "offset": 0, "scale": 100}, # TODO: calculate these lists based on "FGE" type
{"channel": "U_Bin", "offset": 0, "scale": 500}, "U": [{"channel": "U_Volt", "offset": 21690, "scale": 978.4}],
], "V": [{"channel": "V_Volt", "offset": 0, "scale": 971.0}],
"V": [ "W": [{"channel": "W_Volt", "offset": 45532, "scale": 966.7}],
{"channel": "V_Volt", "offset": 0, "scale": 100}, },
{"channel": "V_Bin", "offset": 0, "scale": 500}, "electronics": {
], "serial": "E570",
"W": [ # these scale values are used to convert voltage
{"channel": "W_Volt", "offset": 0, "scale": 100}, "x-scale": 978.4, # nT/V
{"channel": "W_Bin", "offset": 0, "scale": 500}, "y-scale": 971.0, # nT/V
], "z-scale": 966.7, # nT/V
"temperature-scale": 0.01, # V/K
},
"sensor": {
"serial": "S0445",
# these constants combine with instrument setting for offset
"x-constant": 37474, # nT/mA
"y-constant": 37191, # nT/mA
"z-constant": 37025, # nT/mA
}, },
}, },
}, },
...@@ -360,7 +366,6 @@ _INSTRUMENT_METADATA = [ ...@@ -360,7 +366,6 @@ _INSTRUMENT_METADATA = [
"V": [{"channel": "V_Volt", "offset": 0, "scale": 310.48}], "V": [{"channel": "V_Volt", "offset": 0, "scale": 310.48}],
"W": [{"channel": "W_Volt", "offset": 7654, "scale": 317.5}], "W": [{"channel": "W_Volt", "offset": 7654, "scale": 317.5}],
}, },
# this info should get updated when available
"electronics": { "electronics": {
"serial": "E0542", "serial": "E0542",
# these scale values are used to convert voltage # these scale values are used to convert voltage
...@@ -539,7 +544,7 @@ _INSTRUMENT_METADATA = [ ...@@ -539,7 +544,7 @@ _INSTRUMENT_METADATA = [
{ {
"network": "NT", "network": "NT",
"station": "SJG", "station": "SJG",
"start_time": None, "start_time": "2023-08-18T19:02:34.000Z",
"end_time": None, "end_time": None,
"instrument": { "instrument": {
"type": "FGE", "type": "FGE",
...@@ -550,7 +555,6 @@ _INSTRUMENT_METADATA = [ ...@@ -550,7 +555,6 @@ _INSTRUMENT_METADATA = [
"V": [{"channel": "V_Volt", "offset": 0, "scale": 312.2797}], "V": [{"channel": "V_Volt", "offset": 0, "scale": 312.2797}],
"W": [{"channel": "W_Volt", "offset": 24288, "scale": 311.9576}], "W": [{"channel": "W_Volt", "offset": 24288, "scale": 311.9576}],
}, },
# this info should get updated when available
"electronics": { "electronics": {
"serial": "E0543", "serial": "E0543",
# these scale values are calculated manually # these scale values are calculated manually
...@@ -571,7 +575,7 @@ _INSTRUMENT_METADATA = [ ...@@ -571,7 +575,7 @@ _INSTRUMENT_METADATA = [
{ {
"network": "NT", "network": "NT",
"station": "SJT", "station": "SJT",
"start_time": None, "start_time": "2023-08-18T19:02:34.000Z",
"end_time": None, "end_time": None,
"instrument": { "instrument": {
"type": "Narod", "type": "Narod",
...@@ -703,4 +707,82 @@ _INSTRUMENT_METADATA = [ ...@@ -703,4 +707,82 @@ _INSTRUMENT_METADATA = [
# }, # },
# }, # },
# }, # },
# {
# "network": "NT",
# "station": "SJT",
# "start_time": None,
# "end_time": "2023-08-18T19:02:34.000Z",
# "instrument": {
# "type": "FGE",
# "channels": {
# # each channel maps to a list of components to calculate nT
# # TODO: calculate these lists based on "FGE" type
# "U": [{"channel": "U_Volt", "offset": 27047, "scale": 313.2034}],
# "V": [{"channel": "V_Volt", "offset": 0, "scale": 312.2797}],
# "W": [{"channel": "W_Volt", "offset": 24288, "scale": 311.9576}],
# },
# # this info should get updated when available
# "electronics": {
# "serial": "E0543",
# # these scale values are calculated manually
# "x-scale": 313.2034, # nT/V
# "y-scale": 312.2797, # nT/V
# "z-scale": 311.9576, # nT/V
# "temperature-scale": 0.01, # V/K
# },
# "sensor": {
# "serial": "S0419",
# # these constants combine with instrument setting for offset
# "x-constant": 36958, # nT/mA
# "y-constant": 36849, # nT/mA
# "z-constant": 36811, # nT/mA
# },
# },
# },
# {
# "network": "NT",
# "station": "SJG",
# "start_time": None,
# "end_time": "2023-08-18T19:02:34.000Z",
# "instrument": {
# "type": "Narod",
# "channels": {
# "U": [
# {"channel": "U_Volt", "offset": 0, "scale": 100},
# {"channel": "U_Bin", "offset": 0, "scale": 500},
# ],
# "V": [
# {"channel": "V_Volt", "offset": 0, "scale": 100},
# {"channel": "V_Bin", "offset": 0, "scale": 500},
# ],
# "W": [
# {"channel": "W_Volt", "offset": 0, "scale": 100},
# {"channel": "W_Bin", "offset": 0, "scale": 500},
# ],
# },
# },
# },
# {
# "network": "NT",
# "station": "FRD",
# "start_time": None,
# "end_time": None,
# "instrument": {
# "type": "Narod",
# "channels": {
# "U": [
# {"channel": "U_Volt", "offset": 0, "scale": 100},
# {"channel": "U_Bin", "offset": 0, "scale": 500},
# ],
# "V": [
# {"channel": "V_Volt", "offset": 0, "scale": 100},
# {"channel": "V_Bin", "offset": 0, "scale": 500},
# ],
# "W": [
# {"channel": "W_Volt", "offset": 0, "scale": 100},
# {"channel": "W_Bin", "offset": 0, "scale": 500},
# ],
# },
# },
# },
] ]
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment