diff --git a/geomagio/Metadata.py b/geomagio/Metadata.py index 9c2ad7cab177a49d6e89c20bb926a95aa473b688..f14b6ae620157f3ccb46288965cea6087f628078 100644 --- a/geomagio/Metadata.py +++ b/geomagio/Metadata.py @@ -38,29 +38,25 @@ _INSTRUMENT_METADATA = [ "type": "FGE", "channels": { # 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: Adjust offset for new FGE sensor & electronics? (installed 3/20/22) - "U": [{"channel": "U_Volt", "offset": 20613, "scale": 980}], - "V": [{"channel": "V_Volt", "offset": 0, "scale": 980}], - "W": [{"channel": "W_Volt", "offset": 47450, "scale": 980}], + "U": [{"channel": "U_Volt", "offset": 20613, "scale": 966.762}], + "V": [{"channel": "V_Volt", "offset": 0, "scale": 944.125}], + "W": [{"channel": "W_Volt", "offset": 47450, "scale": 975.587}], }, "electronics": { "serial": "TBD", # these scale values are used to convert voltage - # Temporary values until actuals are obtained. - "x-scale": 980, # nT/V - "y-scale": 980, # nT/V - "z-scale": 980, # nT/V + "x-scale": 966.762, # nT/V + "y-scale": 944.125, # nT/V + "z-scale": 975.587, # nT/V "temperature-scale": 0.01, # V/K }, "sensor": { "serial": "TBD", # these constants combine with instrument setting for offset - # Temporary values until actuals are obtained. - "x-constant": 1, # nT/mA - "y-constant": 1, # nT/mA - "z-constant": 1, # nT/mA + "x-constant": 37027, # nT/mA + "y-constant": 36160, # nT/mA + "z-constant": 37365, # nT/mA }, }, }, @@ -561,26 +557,25 @@ _INSTRUMENT_METADATA = [ "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": 0, "scale": 320.0}], - "V": [{"channel": "V_Volt", "offset": 0, "scale": 320.0}], - "W": [{"channel": "W_Volt", "offset": 0, "scale": 320.0}], - }, - ## this info should get updated when available - # "electronics": { - # "serial": "E0542", - # # these scale values are used to convert voltage - # "x-scale": 313.2, # nT/V - # "y-scale": 312.3, # nT/V - # "z-scale": 312.0, # 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 - # }, + "U": [{"channel": "U_Volt", "offset": 0, "scale": 313.203}], + "V": [{"channel": "V_Volt", "offset": 0, "scale": 312.280}], + "W": [{"channel": "W_Volt", "offset": 0, "scale": 311.958}], + }, + "electronics": { + "serial": "E0542", + # these scale values are used to convert voltage + "x-scale": 313.203, # nT/V + "y-scale": 312.280, # nT/V + "z-scale": 311.958, # 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 + }, }, }, {