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

Merge branch 'Update-metadata.py' into 'master' 

Correct data for BDT and SJT

See merge request !216
parents 2cbeaca3 3fb2c5e0
No related branches found
No related tags found
1 merge request!216Correct data for BDT and SJT
Pipeline #243174 passed
Stage: init
Stage: test
Stage: integration
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 28 additions and 33 deletions
geomagio/Metadata.py
+ 28
− 33
View file @ 564a073d
...@@ -38,29 +38,25 @@ _INSTRUMENT_METADATA = [ ...@@ -38,29 +38,25 @@ _INSTRUMENT_METADATA = [
"type": "FGE", "type": "FGE",
"channels": { "channels": {
# each channel maps to a list of components to calculate nT # each channel maps to a list of components to calculate nT
# Temporary values until actuals are obtained.
# 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.762}],
"U": [{"channel": "U_Volt", "offset": 20613, "scale": 980}], "V": [{"channel": "V_Volt", "offset": 0, "scale": 944.125}],
"V": [{"channel": "V_Volt", "offset": 0, "scale": 980}], "W": [{"channel": "W_Volt", "offset": 47450, "scale": 975.587}],
"W": [{"channel": "W_Volt", "offset": 47450, "scale": 980}],
}, },
"electronics": { "electronics": {
"serial": "TBD", "serial": "TBD",
# these scale values are used to convert voltage # these scale values are used to convert voltage
# Temporary values until actuals are obtained. "x-scale": 966.762, # nT/V
"x-scale": 980, # nT/V "y-scale": 944.125, # nT/V
"y-scale": 980, # nT/V "z-scale": 975.587, # nT/V
"z-scale": 980, # nT/V
"temperature-scale": 0.01, # V/K "temperature-scale": 0.01, # V/K
}, },
"sensor": { "sensor": {
"serial": "TBD", "serial": "TBD",
# 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": 1, # nT/mA "y-constant": 36160, # nT/mA
"y-constant": 1, # nT/mA "z-constant": 37365, # nT/mA
"z-constant": 1, # nT/mA
}, },
}, },
}, },
...@@ -561,26 +557,25 @@ _INSTRUMENT_METADATA = [ ...@@ -561,26 +557,25 @@ _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
"U": [{"channel": "U_Volt", "offset": 0, "scale": 320.0}], "U": [{"channel": "U_Volt", "offset": 0, "scale": 313.203}],
"V": [{"channel": "V_Volt", "offset": 0, "scale": 320.0}], "V": [{"channel": "V_Volt", "offset": 0, "scale": 312.280}],
"W": [{"channel": "W_Volt", "offset": 0, "scale": 320.0}], "W": [{"channel": "W_Volt", "offset": 0, "scale": 311.958}],
}, },
## 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 "x-scale": 313.203, # nT/V
# "x-scale": 313.2, # nT/V "y-scale": 312.280, # nT/V
# "y-scale": 312.3, # nT/V "z-scale": 311.958, # nT/V
# "z-scale": 312.0, # nT/V "temperature-scale": 0.01, # V/K
# "temperature-scale": 0.01, # V/K },
# }, "sensor": {
# "sensor": { "serial": "S0419",
# "serial": "S0419", # these constants combine with instrument setting for offset
# # these constants combine with instrument setting for offset "x-constant": 36958, # nT/mA
# "x-constant": 36958, # nT/mA "y-constant": 36849, # nT/mA
# "y-constant": 36849, # nT/mA "z-constant": 36811, # nT/mA
# "z-constant": 36811, # nT/mA },
# },
}, },
}, },
{ {
......
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