From 30dd99949dbaab78de2eec68d610979afc764f34 Mon Sep 17 00:00:00 2001
From: Eddie McWhirter <emcwhirter@usgs.gov>
Date: Tue, 23 Jun 2015 15:18:17 -0600
Subject: [PATCH] Move logic for total minute time output to value formatter.
---
geomagio/pcdcp/PCDCPWriter.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/geomagio/pcdcp/PCDCPWriter.py b/geomagio/pcdcp/PCDCPWriter.py
index 743426d15..7e5dccc9f 100644
--- a/geomagio/pcdcp/PCDCPWriter.py
+++ b/geomagio/pcdcp/PCDCPWriter.py
@@ -77,7 +77,7 @@ class PCDCPWriter(object):
for i in xrange(len(traces[0].data)):
buf.append(self._format_values(
datetime.utcfromtimestamp(starttime + i * delta),
- (int(round(t.data[i]*100)) for t in traces)))
+ (t.data[i] for t in traces)))
return ''.join(buf)
@@ -98,11 +98,11 @@ class PCDCPWriter(object):
Formatted line containing values.
"""
tt = time.timetuple()
- totalMinutes = tt.tm_hour * 60 + tt.tm_min
+ totalMinutes = int(tt.tm_hour * 60 + tt.tm_min)
return '{0:0>4d} ' \
'{2: >8d} {3: >8d} {4: >8d} {5: >8d}\n'.format(
totalMinutes, int(time.microsecond / 1000),
- *[self.empty_value if numpy.isnan(val) else val
+ *[self.empty_value if numpy.isnan(val) else int(round(val*100))
for val in values])
@classmethod
--
GitLab