223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

syntax polishing

This commit is contained in:
Philip Eisenlohr 2015-06-13 11:43:34 +00:00
parent 081bc33159
commit 3d7dfba40a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/damask/asciitable.py
View File

@ -330,16 +330,21 @@ class ASCIItable():
if not isinstance(labels,list): if not isinstance(labels,list):
labels = [labels] labels = [labels]
if labels == [None] or labels == []: if labels == [None] or labels == []:
use = np.arange(self.__IO__['validReadSize']) # use all columns (and keep labels intact) use = np.arange(self.__IO__['validReadSize']) # use all columns (and keep labels intact)
labels_missing = [] labels_missing = []
else: else:
indices = self.label_index(labels) # check requested labels indices = self.label_index(labels) # check requested labels
present = np.where(indices >= 0)[0] # positions in request list of labels that are present ... present = np.where(indices >= 0)[0] # positions in request list of labels that are present ...
missing = np.where(indices < 0)[0] # ... and missing in table missing = np.where(indices < 0)[0] # ... and missing in table
labels_missing = np.array( labels) [missing] # corresponding labels ... labels_missing = np.array(labels)[missing] # labels of missing data
self.labels = list(np.array(self.labels)[indices[present]]) # ... for missing and present columns
self.__IO__['validReadSize'] = len(present) # update data width columns = []
use = indices[present] for c in indices[present]: # for all valid labels ...
columns += range(c,c+self.label_dimension(c)) # ... transparently add all components
use = np.array(columns)
self.labels = list(np.array(self.labels)[use]) # ... for missing and present columns
self.__IO__['validReadSize'] = len(use) # update data width
try: try:
self.data_rewind() # try to wind back to start of data self.data_rewind() # try to wind back to start of data