From 1927dab83ef9781350e8b62bcd272e042cfc044d Mon Sep 17 00:00:00 2001 From: "Mads M. Pedersen" <mmpe@dtu.dk> Date: Thu, 4 May 2017 12:50:07 +0200 Subject: [PATCH] fixed that some stfiles does not start with int specifying the number of sets --- wetb/flex/__init__.py | 5 +++-- wetb/hawc2/st_file.py | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wetb/flex/__init__.py b/wetb/flex/__init__.py index 4d88eaf1..9bdc6ddb 100644 --- a/wetb/flex/__init__.py +++ b/wetb/flex/__init__.py @@ -1,6 +1,7 @@ from ._io import load, read_sensor_info from wetb import gtsdf +import numpy as np class Dataset(gtsdf.Dataset): - def __init__(self, filename): - self.time, self.data, self.info = load(filename) \ No newline at end of file + def __init__(self, filename, name_stop=8,dtype=np.float): + self.time, self.data, self.info = load(filename, name_stop,dtype) \ No newline at end of file diff --git a/wetb/hawc2/st_file.py b/wetb/hawc2/st_file.py index 09ae7240..b739bc97 100644 --- a/wetb/hawc2/st_file.py +++ b/wetb/hawc2/st_file.py @@ -68,7 +68,8 @@ class StFile(object): def __init__(self, filename): with open (filename) as fid: txt = fid.read() - no_maindata_sets = int(txt.replace("#","").strip()[0]) +# Some files sat + no_maindata_sets = int(txt.strip()[0]) assert no_maindata_sets == txt.count("#") self.main_data_sets = {} for mset in txt.split("#")[1:]: -- GitLab