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

shortened syntax. fixed undefined file['croak']

This commit is contained in:
Philip Eisenlohr 2014-10-02 04:49:46 +00:00
parent f0c2ef609a
commit 23ee538dcb
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
processing/post/addMapped.py
View File

@ -67,17 +67,18 @@ if options.asciitable != None and os.path.isfile(options.asciitable):
for datatype,info in datainfo.items(): for datatype,info in datainfo.items():
for label in info['label']: for label in info['label']:
key = {True:'1_'+label,False:label}[info['len']==1] key = '1_'+label if info['len'] > 1 else label
if key in mappedTable.labels: if key in mappedTable.labels:
labels.append(label) # extend labels labels.append(label) # extend labels
indices += range(mappedTable.labels.index(key), indices += range(mappedTable.labels.index(key),
mappedTable.labels.index(key)+datainfo[datatype]['len']) mappedTable.labels.index(key)+datainfo[datatype]['len'])
else: else:
file['croak'].write('column %s not found...\n'%label) sys.stderr.write('column %s not found...\n'%label)
break break
mappedTable.data_readArray(indices) mappedTable.data_readArray(indices)
mappedTable.__IO__['in'].close() # close mapped input ASCII table mappedTable.input_close() # close mapped input ASCII table
else: else:
parser.error('missing mapped ASCIItable...') parser.error('missing mapped ASCIItable...')
@ -106,8 +107,8 @@ for file in files:
# ------------------------------------------ assemble header -------------------------------------- # ------------------------------------------ assemble header --------------------------------------
for datatype,info in datainfo.items(): for datatype,info in datainfo.items():
for label in info['label']: for label in info['label']:
table.labels_append({True:['%i_%s'%(i+1,label) for i in xrange(info['len'])], table.labels_append(label if info['len'] == 1 else \
False:table.labels_append(label)}[info['len']>1] ) # extend ASCII header of current table with new labels ['%i_%s'%(i+1,label) for i in xrange(info['len'])]) # extend ASCII header of current table with new labels
table.head_write() table.head_write()
# ------------------------------------------ process data ------------------------------------------ # ------------------------------------------ process data ------------------------------------------