Skip to content
Snippets Groups Projects
Commit a0bacf3d authored by Cain, Payton David's avatar Cain, Payton David
Browse files

Gather ordinates in SPREADSHEET_MEASUREMENTS

parent 89af2185
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
geomagio/residual/SpreadsheetAbsolutesFactory.py
+ 85
− 71
View file @ a0bacf3d
...@@ -18,191 +18,205 @@ SPREADSHEET_MEASUREMENTS = [ ...@@ -18,191 +18,205 @@ SPREADSHEET_MEASUREMENTS = [
{"type": mt.FIRST_MARK_UP, "angle": "B13"}, {"type": mt.FIRST_MARK_UP, "angle": "B13"},
{"type": mt.FIRST_MARK_DOWN, "angle": "C13"}, {"type": mt.FIRST_MARK_DOWN, "angle": "C13"},
{"type": mt.FIRST_MARK_DOWN, "angle": "D13"}, {"type": mt.FIRST_MARK_DOWN, "angle": "D13"},
# declination
{"type": mt.WEST_DOWN, "angle": "C19", "residual": "E19", "time": "B19"},
{"type": mt.WEST_DOWN, "angle": "C20", "residual": "E20", "time": "B20"},
{"type": mt.EAST_DOWN, "angle": "C21", "residual": "E21", "time": "B21"},
{"type": mt.EAST_DOWN, "angle": "C22", "residual": "E22", "time": "B22"},
{"type": mt.WEST_UP, "angle": "C23", "residual": "E23", "time": "B23"},
{"type": mt.WEST_UP, "angle": "C24", "residual": "E24", "time": "B24"},
{"type": mt.EAST_UP, "angle": "C25", "residual": "E25", "time": "B25"},
{"type": mt.EAST_UP, "angle": "C26", "residual": "E26", "time": "B26"},
# second mark
{"type": mt.SECOND_MARK_UP, "angle": "A31"},
{"type": mt.SECOND_MARK_UP, "angle": "B31"},
{"type": mt.SECOND_MARK_DOWN, "angle": "C31"},
{"type": mt.SECOND_MARK_DOWN, "angle": "D31"},
# meridian
{"type": mt.MERIDIAN, "angle": "C37"},
# inclination
{"type": mt.SOUTH_DOWN, "angle": "D37", "residual": "E37", "time": "B37"},
{"type": mt.SOUTH_DOWN, "angle": "D38", "residual": "E38", "time": "B38"},
{"type": mt.NORTH_UP, "angle": "D39", "residual": "E39", "time": "B39"},
{"type": mt.NORTH_UP, "angle": "D40", "residual": "E40", "time": "B40"},
{"type": mt.SOUTH_UP, "angle": "D41", "residual": "E41", "time": "B41"},
{"type": mt.SOUTH_UP, "angle": "D42", "residual": "E42", "time": "B42"},
{"type": mt.NORTH_DOWN, "angle": "D43", "residual": "E43", "time": "B43"},
{"type": mt.NORTH_DOWN, "angle": "D44", "residual": "E44", "time": "B44"},
# scaling
{"type": mt.NORTH_DOWN_SCALE, "angle": "D44", "residual": "E44", "time": "B44"},
{"type": mt.NORTH_DOWN_SCALE, "angle": "D45", "residual": "E45", "time": "B45"},
]
SPREADSHEET_ORDINATES = [
# declination # declination
{ {
"type": mt.WEST_DOWN, "type": mt.WEST_DOWN,
"angle": "C19",
"residual": "E19",
"time": "B19",
"h": "F19", "h": "F19",
"e": "G19", "e": "G19",
"z": "H19", "z": "F19",
"f": "F19", "f": "H19",
"time": "B19",
}, },
{ {
"type": mt.WEST_DOWN, "type": mt.WEST_DOWN,
"angle": "C20",
"residual": "E20",
"time": "B20",
"h": "F20", "h": "F20",
"e": "G20", "e": "G20",
"z": "H20", "z": "F20",
"f": "F20", "f": "H20",
"time": "B20",
}, },
{ {
"type": mt.EAST_DOWN, "type": mt.EAST_DOWN,
"angle": "C21",
"residual": "E21",
"time": "B21",
"h": "F21", "h": "F21",
"e": "G21", "e": "G21",
"z": "H19", "z": "F21",
"f": "F21", "f": "H21",
"time": "B21",
}, },
{ {
"type": mt.EAST_DOWN, "type": mt.EAST_DOWN,
"angle": "C22",
"residual": "E22",
"time": "B22",
"h": "F22", "h": "F22",
"e": "G22", "e": "G22",
"z": "H20", "z": "F22",
"f": "F22", "f": "H22",
"time": "B22",
}, },
{ {
"type": mt.WEST_UP, "type": mt.WEST_UP,
"angle": "C23",
"residual": "E23",
"time": "B23",
"h": "F23", "h": "F23",
"e": "G23", "e": "G23",
"z": "H19", "z": "F23",
"f": "F23", "f": "H23",
"time": "B23",
}, },
{ {
"type": mt.WEST_UP, "type": mt.WEST_UP,
"angle": "C24",
"residual": "E24",
"time": "B24",
"h": "F24", "h": "F24",
"e": "G24", "e": "G24",
"z": "H20", "z": "F24",
"f": "F24", "f": "H24",
"time": "B24",
}, },
{ {
"type": mt.EAST_UP, "type": mt.EAST_UP,
"angle": "C25",
"residual": "E25",
"time": "B25",
"h": "F25", "h": "F25",
"e": "G25", "e": "G25",
"z": "H19", "z": "F25",
"f": "F25", "f": "H25",
"time": "B25",
}, },
{ {
"type": mt.EAST_UP, "type": mt.EAST_UP,
"angle": "C26",
"residual": "E26",
"time": "B26",
"h": "F26", "h": "F26",
"e": "G26", "e": "G26",
"z": "H20", "z": "F26",
"f": "F26", "f": "H26",
"time": "B26",
}, },
# second mark
{"type": mt.SECOND_MARK_UP, "angle": "A31"},
{"type": mt.SECOND_MARK_UP, "angle": "B31"},
{"type": mt.SECOND_MARK_DOWN, "angle": "C31"},
{"type": mt.SECOND_MARK_DOWN, "angle": "D31"},
# meridian
{"type": mt.MERIDIAN, "angle": "C37"},
# inclination # inclination
{ {
"type": mt.SOUTH_DOWN, "type": mt.SOUTH_DOWN,
"angle": "D37",
"residual": "E37",
"time": "B37",
"h": "C50", "h": "C50",
"e": "D50", "e": "D50",
"z": "E50", "z": "E50",
"f": "B50", "f": "B50",
"time": "A50",
}, },
{ {
"type": mt.SOUTH_DOWN, "type": mt.SOUTH_DOWN,
"angle": "D38",
"residual": "E38",
"time": "B38",
"h": "C51", "h": "C51",
"e": "D51", "e": "D51",
"z": "E51", "z": "E51",
"f": "B51", "f": "B51",
"time": "A51",
}, },
{ {
"type": mt.NORTH_UP, "type": mt.NORTH_UP,
"angle": "D39",
"residual": "E39",
"time": "B39",
"h": "C52", "h": "C52",
"e": "D52", "e": "D52",
"z": "E52", "z": "E52",
"f": "B52", "f": "B52",
"time": "A52",
}, },
{ {
"type": mt.NORTH_UP, "type": mt.NORTH_UP,
"angle": "D40",
"residual": "E40",
"time": "B40",
"h": "C53", "h": "C53",
"e": "D53", "e": "D53",
"z": "E53", "z": "E53",
"f": "B53", "f": "B53",
"time": "A53",
}, },
{ {
"type": mt.SOUTH_UP, "type": mt.SOUTH_UP,
"angle": "D41",
"residual": "E41",
"time": "B41",
"h": "C54", "h": "C54",
"e": "D54", "e": "D54",
"z": "E54", "z": "E54",
"f": "B54", "f": "B54",
"time": "A54",
}, },
{ {
"type": mt.SOUTH_UP, "type": mt.SOUTH_UP,
"angle": "D42",
"residual": "E42",
"time": "B42",
"h": "C55", "h": "C55",
"e": "D55", "e": "D55",
"z": "E55", "z": "E55",
"f": "B55", "f": "B55",
"time": "A55",
}, },
{ {
"type": mt.NORTH_DOWN, "type": mt.NORTH_DOWN,
"angle": "D43",
"residual": "E43",
"time": "B43",
"h": "C56", "h": "C56",
"e": "D56", "e": "D56",
"z": "E56", "z": "E56",
"f": "B56", "f": "B56",
"time": "A56",
}, },
{ {
"type": mt.NORTH_DOWN, "type": mt.NORTH_DOWN,
"angle": "D43",
"residual": "E43",
"time": "B43",
"h": "C57", "h": "C57",
"e": "D57", "e": "D57",
"z": "E57", "z": "E57",
"f": "B57", "f": "B57",
"time": "A57",
}, },
{ {
"type": mt.NORTH_DOWN, "type": mt.NORTH_DOWN,
"angle": "D44",
"residual": "E44",
"time": "B44",
"h": "C58", "h": "C58",
"e": "D58", "e": "D58",
"z": "E58", "z": "E58",
"f": "B58", "f": "B58",
"time": "A58",
}, },
# scaling # scaling
{ {
"type": mt.NORTH_DOWN_SCALE, "type": mt.NORTH_DOWN_SCALE,
"angle": "D44",
"residual": "E44",
"time": "B44",
"h": "C57", "h": "C57",
"e": "D57", "e": "D57",
"z": "E57", "z": "E57",
"f": "B57", "f": "B57",
"time": "A57",
}, },
{ {
"type": mt.NORTH_DOWN_SCALE, "type": mt.NORTH_DOWN_SCALE,
"angle": "D45",
"residual": "E45",
"time": "B45",
"h": "C58", "h": "C58",
"e": "D58", "e": "D58",
"z": "E58", "z": "E58",
"f": "B58", "f": "B58",
"time": "A58",
}, },
] ]
...@@ -357,12 +371,12 @@ class SpreadsheetAbsolutesFactory(object): ...@@ -357,12 +371,12 @@ class SpreadsheetAbsolutesFactory(object):
"""Parse ordinates from a measurement sheet. """Parse ordinates from a measurement sheet.
""" """
ordinates = [] ordinates = []
for m in SPREADSHEET_ORDINATES: for m in SPREADSHEET_MEASUREMENTS:
measurement_type = m["type"] measurement_type = m["type"]
h = "h" in m and sheet[m["h"]].value or None h = "h" in m and sheet[m["h"]].value or 0.0
e = "e" in m and sheet[m["e"]].value or None e = "e" in m and sheet[m["e"]].value or 0.0
z = "z" in m and sheet[m["z"]].value or None z = "z" in m and sheet[m["z"]].value or 0.0
f = "f" in m and sheet[m["f"]].value or None f = "f" in m and sheet[m["f"]].value or 0.0
time = ( time = (
"time" in m "time" in m
and parse_relative_time(base_date, sheet[m["time"]].value) and parse_relative_time(base_date, sheet[m["time"]].value)
......
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