Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AossTower
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MetObs
AossTower
Commits
42e9cd18
Verified
Commit
42e9cd18
authored
5 years ago
by
David Hoese
Browse files
Options
Downloads
Patches
Plain Diff
Add handling of the 4th version of the CSV/ACSII files
parent
d6386d31
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aosstower/level_00/parser.py
+14
-3
14 additions, 3 deletions
aosstower/level_00/parser.py
with
14 additions
and
3 deletions
aosstower/level_00/parser.py
+
14
−
3
View file @
42e9cd18
...
...
@@ -141,6 +141,17 @@ class ParserV1V2(object):
'
rh_shield_freq
'
,
'
rh
'
,
'
air_temp_6_3m
'
,
'
dewpoint
'
,
'
rtd_shield_freq
'
,
'
air_temp
'
,
'
solar_flux
'
,
'
precip
'
,
'
accum_precip
'
,
'
altimeter
'
]
# , 'altimeter2']
# These are the new fields in the input files but unused by the rest of
# the tower code. At the risk of breaking other pieces of software, these
# are not included in the above list, but are documented here for future
# reference.
#
# Altimeter2 (slightly different calculation, same units as Altimeter)
# LW_in (W/m^2)
# tempPyrg (Kelvin, temperature of pyrgeometer)
# pyrgTP (W/m^2, raw reading from the pyrgeometer thermopile)
# pyrgTC (W/m^2, temperature correction for the pyrgeometer)
# TC_110 (degC, this is a second air temperature in the new aspirated radiation shield)
@staticmethod
def
maybe_mine
(
line
):
...
...
@@ -159,9 +170,9 @@ class ParserV1V2(object):
def
make_frame
(
self
,
line
):
parts
=
line
.
split
(
'
,
'
)
if
len
(
parts
)
not
in
[
28
,
29
,
33
]:
raise
LineParseError
(
"
Expected 28, 29, or 3
3
parts
"
,
line
)
version
=
{
28
:
1
,
29
:
2
,
33
:
3
}[
len
(
parts
)]
if
len
(
parts
)
not
in
[
28
,
29
,
33
,
34
]:
raise
LineParseError
(
"
Expected 28, 29,
33,
or 3
4
parts
"
,
line
)
version
=
{
28
:
1
,
29
:
2
,
33
:
3
,
34
:
4
}[
len
(
parts
)]
raw_data
=
[(
'
version
'
,
version
)]
+
list
(
zip
(
self
.
names
,
parts
))
try
:
raw_data
.
append
((
'
stamp
'
,
self
.
_get_stamp
(
parts
)))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment