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

better robustness against scalar arguments and “None”.

This commit is contained in:
Philip Eisenlohr 2015-05-21 21:53:54 +00:00
parent 2349e6c79c
commit 4bd44f8e43
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/damask/asciitable.py
View File

@ -174,13 +174,14 @@ class ASCIItable():
if isinstance(labels,list): # check whether list of labels is requested if isinstance(labels,list): # check whether list of labels is requested
idx = [] idx = []
for label in labels: for label in labels:
try: if label != None:
idx.append(int(label)) # column given as integer number?
except ValueError:
try: try:
idx.append(self.labels.index(label)) # locate string in label list idx.append(int(label)) # column given as integer number?
except ValueError: except ValueError:
if label != None: idx.append(-1) # not found... try:
idx.append(self.labels.index(label)) # locate string in label list
except ValueError:
idx.append(-1) # not found...
else: else:
try: try:
idx = int(labels) idx = int(labels)
@ -266,7 +267,9 @@ class ASCIItable():
read whole data of all (given) labels as numpy array read whole data of all (given) labels as numpy array
''' '''
if labels == []: if not isinstance(labels,list):
labels = [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: