diff --git a/geomagio/pcdcp/PCDCPFactory.py b/geomagio/pcdcp/PCDCPFactory.py index af097ac116a0d2f7dd937e6ff829a69efaae3b85..a4040da19c225e9f2510b5498e1b43ad840421c4 100644 --- a/geomagio/pcdcp/PCDCPFactory.py +++ b/geomagio/pcdcp/PCDCPFactory.py @@ -90,7 +90,7 @@ class PCDCPFactory(TimeseriesFactory): Raises ------ TimeseriesFactoryException - if invalid values are requested, or errors occur while + If invalid values are requested, or errors occur while retrieving timeseries. """ observatory = observatory or self.observatory @@ -110,12 +110,12 @@ class PCDCPFactory(TimeseriesFactory): return timeseries def parse_string(self, pcdcpString): - """Parse the contents of a string in the format of an pcdcp file. + """Parse the contents of a string in the format of a pcdcp file. Parameters ---------- pcdcpString : str - string containing PCDCP content. + String containing PCDCP content. Returns ------- @@ -163,7 +163,7 @@ class PCDCPFactory(TimeseriesFactory): Raises ------ TimeseriesFactoryException - if type or interval are not supported. + If type or interval are not supported. """ return self.urlTemplate % { 'i': self._get_interval_abbreviation(interval), diff --git a/geomagio/pcdcp/PCDCPParser.py b/geomagio/pcdcp/PCDCPParser.py index d05fbe077232d7f019cfb1bd231d3b9558e61f76..bbaefb6045b60c81f81a05310ea8123fed5375c8 100644 --- a/geomagio/pcdcp/PCDCPParser.py +++ b/geomagio/pcdcp/PCDCPParser.py @@ -57,7 +57,6 @@ class PCDCPParser(object): Adds value to ``self.header``. """ - print "Header:", line self.header['header'] = line self.header['observatory'] = line[0:3] self.header['year'] = line[6:10] @@ -70,13 +69,12 @@ class PCDCPParser(object): Adds time to ``self.times``. Adds channel values to ``self.data``. """ - print "Parse data!" t, d1, d2, d3, d4 = self._parsedata t.append(line[0:4]) - d1.append(line[5:13]) - d2.append(line[14:21]) - d3.append(line[22:30]) - d4.append(line[31:39]) + d1.append(int(line[5:13])) + d2.append(int(line[14:22])) + d3.append(int(line[23:31])) + d4.append(int(line[32:40])) def _post_process(self): """Post processing after data is parsed.