Skip to content

Commit de9a153

Browse files
author
Rastko Sknepnek
committed
ReadData can now read gzipped files.
1 parent ad2c342 commit de9a153

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

FormerAnalysis/read_data.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,20 @@
1717

1818
# Reads in data files. Base handler for data analysis
1919

20+
import gzip
21+
2022
class ReadData:
2123

2224
def __init__(self, filename):
23-
with open(filename,'r') as self.inp:
24-
self.__read_data()
25-
self.inp.close()
25+
if filename.split('.')[-1] == 'gz':
26+
self.lines = gzip.open(filename,'rb').read()
27+
else:
28+
self.lines = open(filename,'r').read()
29+
self.__read_data()
2630
self.N = len(self.data[0])
2731

2832
def __read_data(self):
29-
lines = self.inp.readlines()
33+
lines = self.lines.split('\n')
3034
lines = map(lambda x: x.strip(), lines)
3135
if lines[0][0] == '#':
3236
self.has_header = True

utils/RastkoVisu/read_data.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,20 @@
1717

1818
# Reads in data files. Base handler for data analysis
1919

20+
import gzip
21+
2022
class ReadData:
2123

2224
def __init__(self, filename):
23-
with open(filename,'r') as self.inp:
24-
self.__read_data()
25-
self.inp.close()
25+
if filename.split('.')[-1] == 'gz':
26+
self.lines = gzip.open(filename,'rb').read()
27+
else:
28+
self.lines = open(filename,'r').read()
29+
self.__read_data()
2630
self.N = len(self.data[0])
2731

2832
def __read_data(self):
29-
lines = self.inp.readlines()
33+
lines = self.lines.split('\n')
3034
lines = map(lambda x: x.strip(), lines)
3135
if lines[0][0] == '#':
3236
self.has_header = True

utils/read_data.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,20 @@
1717

1818
# Reads in data files. Base handler for data analysis
1919

20+
import gzip
21+
2022
class ReadData:
2123

2224
def __init__(self, filename):
23-
with open(filename,'r') as self.inp:
24-
self.__read_data()
25-
self.inp.close()
25+
if filename.split('.')[-1] == 'gz':
26+
self.lines = gzip.open(filename,'rb').read()
27+
else:
28+
self.lines = open(filename,'r').read()
29+
self.__read_data()
2630
self.N = len(self.data[0])
2731

2832
def __read_data(self):
29-
lines = self.inp.readlines()
33+
lines = self.lines.split('\n')
3034
lines = map(lambda x: x.strip(), lines)
3135
if lines[0][0] == '#':
3236
self.has_header = True

utils/read_data.pyc

-60 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)