From aa9a8b21c7868b1355972551de97045b7ffefcf9 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 18 May 2016 18:31:54 +0200 Subject: [PATCH] lables is now a method, not an attribute --- processing/post/addAPS34IDEstrainCoords.py | 2 +- processing/post/addMapped.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/processing/post/addAPS34IDEstrainCoords.py b/processing/post/addAPS34IDEstrainCoords.py index 4c01c55e7..7ba976478 100755 --- a/processing/post/addAPS34IDEstrainCoords.py +++ b/processing/post/addAPS34IDEstrainCoords.py @@ -59,7 +59,7 @@ for name in filenames: for label in datainfo['label']: key = label - if key in table.labels: + if key in table.labels(raw = True): active.append(label) column[label] = table.labels.index(key) # remember columns of requested data else: diff --git a/processing/post/addMapped.py b/processing/post/addMapped.py index 503b0a1f3..da36097d4 100755 --- a/processing/post/addMapped.py +++ b/processing/post/addMapped.py @@ -89,14 +89,14 @@ for name in filenames: # ------------------------------------------ assemble header -------------------------------------- table.info_append(scriptID + '\t' + ' '.join(sys.argv[1:])) - table.labels_append(mappedTable.labels) # extend ASCII header with new labels + table.labels_append(mappedTable.labels(raw = True)) # extend ASCII header with new labels table.head_write() # ------------------------------------------ process data ------------------------------------------ outputAlive = True while outputAlive and table.data_read(): # read next data line of ASCII table - table.data_append(mappedTable.data[int(round(float(table.data[mappedColumn])))+options.offset-1]) # add all mapped data types + table.data_append(mappedTable.data[int(round(float(table.data[mappedColumn])))+options.offset-1]) # add all mapped data types outputAlive = table.data_write() # output processed line # ------------------------------------------ output finalization -----------------------------------