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

Merge branch 'master' into 'master' 

Master

See merge request !173
parents 92bb8615 076defd9
No related branches found
No related tags found
2 merge requests!173Master,!170Add temp metadata for new BDT equip.
Pipeline #135814 passed
Stage: test
Stage: integration
Stage: scan
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 21 additions and 17 deletions
geomagio/Metadata.py
+ 21
− 17
View file @ ec05353b
...@@ -38,25 +38,29 @@ _INSTRUMENT_METADATA = [ ...@@ -38,25 +38,29 @@ _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
"U": [{"channel": "U_Volt", "offset": 20613, "scale": 313.2}], # TODO: Adjust offset for new FGE sensor & electronics? (installed 3/20/22)
"V": [{"channel": "V_Volt", "offset": 0, "scale": 312.3}], "U": [{"channel": "U_Volt", "offset": 20613, "scale": 980}],
"W": [{"channel": "W_Volt", "offset": 47450, "scale": 312.0}], "V": [{"channel": "V_Volt", "offset": 0, "scale": 980}],
"W": [{"channel": "W_Volt", "offset": 47450, "scale": 980}],
}, },
"electronics": { "electronics": {
"serial": "E0542", "serial": "TBD",
# these scale values are used to convert voltage # these scale values are used to convert voltage
"x-scale": 313.2, # V/nT # Temporary values until actuals are obtained.
"y-scale": 312.3, # V/nT "x-scale": 980, # nT/V
"z-scale": 312.0, # V/nT "y-scale": 980, # nT/V
"z-scale": 980, # nT/V
"temperature-scale": 0.01, # V/K "temperature-scale": 0.01, # V/K
}, },
"sensor": { "sensor": {
"serial": "S0419", "serial": "TBD",
# these constants combine with instrument setting for offset # these constants combine with instrument setting for offset
"x-constant": 36958, # nT/mA # Temporary values until actuals are obtained.
"y-constant": 36849, # nT/mA "x-constant": 1, # nT/mA
"z-constant": 36811, # nT/mA "y-constant": 1, # nT/mA
"z-constant": 1, # nT/mA
}, },
}, },
}, },
...@@ -215,9 +219,9 @@ _INSTRUMENT_METADATA = [ ...@@ -215,9 +219,9 @@ _INSTRUMENT_METADATA = [
"electronics": { "electronics": {
"serial": "E0568", "serial": "E0568",
# these scale values are used to convert voltage # these scale values are used to convert voltage
"x-scale": 967.7, # V/nT "x-scale": 967.7, # nT/V
"y-scale": 969.7, # V/nT "y-scale": 969.7, # nT/V
"z-scale": 973.4, # V/nT "z-scale": 973.4, # nT/V
"temperature-scale": 0.01, # V/K "temperature-scale": 0.01, # V/K
}, },
"sensor": { "sensor": {
...@@ -564,9 +568,9 @@ _INSTRUMENT_METADATA = [ ...@@ -564,9 +568,9 @@ _INSTRUMENT_METADATA = [
# "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.2, # V/nT # "x-scale": 313.2, # nT/V
# "y-scale": 312.3, # V/nT # "y-scale": 312.3, # nT/V
# "z-scale": 312.0, # V/nT # "z-scale": 312.0, # nT/V
# "temperature-scale": 0.01, # V/K # "temperature-scale": 0.01, # V/K
# }, # },
# "sensor": { # "sensor": {
......
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