From 4eacc574c9fd63b6cd4e1cc882cbf169cc2eb36d Mon Sep 17 00:00:00 2001
From: "Geels, Brendan Ryan" <bgeels@usgs.gov>
Date: Sat, 23 Apr 2022 01:36:10 +0000
Subject: [PATCH 1/2] Add precise vals for HOT.
---
geomagio/Metadata.py | 39 ++++++++++++++++++++-------------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/geomagio/Metadata.py b/geomagio/Metadata.py
index 202cd676..ebf55593 100644
--- a/geomagio/Metadata.py
+++ b/geomagio/Metadata.py
@@ -413,26 +413,27 @@ _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}],
+ "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": "E0542",
- # # these scale values are used to convert voltage
- # "x-scale": 313.2, # V/nT
- # "y-scale": 312.3, # V/nT
- # "z-scale": 312.0, # V/nT
- # "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
- # },
+ # 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
+ },
},
},
{
--
GitLab
From 58abb86da20b904449a38c5b02a69ca785fc39c2 Mon Sep 17 00:00:00 2001
From: "E. Joshua Rigler" <erigler@usgs.gov>
Date: Mon, 25 Apr 2022 17:41:02 -0600
Subject: [PATCH 2/2] Reformat Metadata.py using black
The original merge request had an extra indentation space that the
black formatter didn't like.
---
geomagio/Metadata.py | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/geomagio/Metadata.py b/geomagio/Metadata.py
index ebf55593..43907b79 100644
--- a/geomagio/Metadata.py
+++ b/geomagio/Metadata.py
@@ -418,22 +418,22 @@ _INSTRUMENT_METADATA = [
"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
- },
+ "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
+ },
},
},
{
--
GitLab