diff --git a/geomagio/Metadata.py b/geomagio/Metadata.py index 3c73200418574c59c53e459d8376ed5a7ecc7cfc..cc78c445c3ec9fdd556b35ff921c0f31aa8f2921 100644 --- a/geomagio/Metadata.py +++ b/geomagio/Metadata.py @@ -356,9 +356,9 @@ _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": 314.28}], + "U": [{"channel": "U_Volt", "offset": 35989, "scale": 314.28}], "V": [{"channel": "V_Volt", "offset": 0, "scale": 310.48}], - "W": [{"channel": "W_Volt", "offset": 0, "scale": 317.5}], + "W": [{"channel": "W_Volt", "offset": 7654, "scale": 317.5}], }, # this info should get updated when available "electronics": { @@ -404,25 +404,25 @@ _INSTRUMENT_METADATA = [ { "network": "NT", "station": "HOT", - "start_time": None, + "start_time": "2022-07-14T16:07:30.000Z", "end_time": None, "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": 0, "scale": 971.8}], - "V": [{"channel": "V_Volt", "offset": 0, "scale": 970.6}], - "W": [{"channel": "W_Volt", "offset": 0, "scale": 960.2}], + "U": [{"channel": "U_Volt", "offset": 27123, "scale": 315.4}], + "V": [{"channel": "V_Volt", "offset": 0, "scale": 315.0}], + "W": [{"channel": "W_Volt", "offset": 21158, "scale": 311.7}], }, # this info should get updated when available "electronics": { "serial": "E558", # these scale values are used to convert voltage # these are calculated using Ohm's law, given scaling resistor value, and given nT/mA values. - "x-scale": 971.8, # nT/V - "y-scale": 970.6, # nT/V - "z-scale": 960.2, # nT/V + "x-scale": 315.4, # nT/V + "y-scale": 315.0, # nT/V + "z-scale": 311.7, # nT/V "temperature-scale": 0.01, # V/K }, "sensor": { @@ -559,9 +559,9 @@ _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": 313.2034}], + "U": [{"channel": "U_Volt", "offset": 27047, "scale": 313.2034}], "V": [{"channel": "V_Volt", "offset": 0, "scale": 312.2797}], - "W": [{"channel": "W_Volt", "offset": 0, "scale": 311.9576}], + "W": [{"channel": "W_Volt", "offset": 24288, "scale": 311.9576}], }, # this info should get updated when available "electronics": { @@ -593,7 +593,7 @@ _INSTRUMENT_METADATA = [ # TODO: calculate these lists based on "FGE" type "U": [{"channel": "U_Volt", "offset": 24024, "scale": 978.355}], "V": [{"channel": "V_Volt", "offset": 0, "scale": 965.901}], - "W": [{"channel": "W_Volt", "offset": 39999, "scale": 954.543}], + "W": [{"channel": "W_Volt", "offset": 40040, "scale": 954.543}], }, # this info should get updated when available "electronics": { @@ -613,7 +613,7 @@ _INSTRUMENT_METADATA = [ }, }, }, - ## Leaving this old object in comments in case we want to save it in the actual database as historical data + ## Leaving these old objects in comments in case we want to save them in the actual database as historical data # { # "network": "NT", # "station": "TUC", @@ -637,4 +637,37 @@ _INSTRUMENT_METADATA = [ # }, # }, # }, + # { + # "network": "NT", + # "station": "HOT", + # "start_time": None, + # "end_time": "2022-07-14T16:07:30.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": 0, "scale": 971.8}], + # "V": [{"channel": "V_Volt", "offset": 0, "scale": 970.6}], + # "W": [{"channel": "W_Volt", "offset": 0, "scale": 960.2}], + # }, + # # this info should get updated when available + # "electronics": { + # "serial": "E558", + # # these scale values are used to convert voltage + # # these are calculated using Ohm's law, given scaling resistor value, and given nT/mA values. + # "x-scale": 971.8, # nT/V + # "y-scale": 970.6, # nT/V + # "z-scale": 960.2, # nT/V + # "temperature-scale": 0.01, # V/K + # }, + # "sensor": { + # "serial": "S0428", + # # these constants combine with instrument setting for offset + # "x-constant": 37220, # nT/mA + # "y-constant": 37175, # nT/mA + # "z-constant": 36775, # nT/mA + # }, + # }, + # }, ]