From c401aca741ab57a0eae3d9431ad1972b12a2f9a0 Mon Sep 17 00:00:00 2001 From: Chris Kerr Date: Fri, 3 May 2019 19:15:34 +0200 Subject: [PATCH] Get rid of flags2_dict as flags2 doesn't actually exist --- galvani/BioLogic.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/galvani/BioLogic.py b/galvani/BioLogic.py index dbee311..e644e68 100644 --- a/galvani/BioLogic.py +++ b/galvani/BioLogic.py @@ -216,7 +216,6 @@ def VMPdata_dtype_from_colIDs(colIDs): type_list = [] field_name_counts = defaultdict(int) flags_dict = OrderedDict() - flags2_dict = OrderedDict() for colID in colIDs: if colID in VMPdata_colID_flag_map: # Some column IDs represent boolean flags or small integers @@ -228,6 +227,9 @@ def VMPdata_dtype_from_colIDs(colIDs): type_list.append(('flags', 'u1')) field_name_counts['flags'] = 1 flag_name, flag_mask, flag_type = VMPdata_colID_flag_map[colID] + # TODO what happens if a flag colID has already been seen + # i.e. if flag_name is already present in flags_dict? + # Does it create a second 'flags' byte in the record? flags_dict[flag_name] = (np.uint8(flag_mask), flag_type) elif colID in VMPdata_colID_dtype_map: field_name, field_type = VMPdata_colID_dtype_map[colID] @@ -240,7 +242,7 @@ def VMPdata_dtype_from_colIDs(colIDs): type_list.append((unique_field_name, field_type)) else: raise NotImplementedError("column type %d not implemented" % colID) - return np.dtype(type_list), flags_dict, flags2_dict + return np.dtype(type_list), flags_dict def read_VMP_modules(fileobj, read_module_data=True): @@ -336,7 +338,7 @@ class MPRfile: else: assert(not any(remaining_headers)) - self.dtype, self.flags_dict, self.flags2_dict = VMPdata_dtype_from_colIDs(column_types) + self.dtype, self.flags_dict = VMPdata_dtype_from_colIDs(column_types) self.data = np.frombuffer(main_data, dtype=self.dtype) assert(self.data.shape[0] == n_data_points) @@ -407,8 +409,5 @@ class MPRfile: if flagname in self.flags_dict: mask, dtype = self.flags_dict[flagname] return np.array(self.data['flags'] & mask, dtype=dtype) - elif flagname in self.flags2_dict: - mask, dtype = self.flags2_dict[flagname] - return np.array(self.data['flags2'] & mask, dtype=dtype) else: raise AttributeError("Flag '%s' not present" % flagname)