diff --git a/processing/post/addSpectralDecomposition.py b/processing/post/addSpectralDecomposition.py index 5909ca147..01371cede 100755 --- a/processing/post/addSpectralDecomposition.py +++ b/processing/post/addSpectralDecomposition.py @@ -50,11 +50,9 @@ for name in filenames: if options.rh: v[np.linalg.det(v) < 0.0,:,2] *= -1.0 for i,o in enumerate(['Min','Mid','Max']): - table.add('eigval{}({})'.format(o,tensor),u[:,i], - scriptID+' '+' '.join(sys.argv[1:])) + table.add('eigval{}({})'.format(o,tensor),u[:,i], scriptID+' '+' '.join(sys.argv[1:])) for i,o in enumerate(['Min','Mid','Max']): - table.add('eigvec{}({})'.format(o,tensor),v[:,:,i], - scriptID+' '+' '.join(sys.argv[1:])) + table.add('eigvec{}({})'.format(o,tensor),v[:,:,i],scriptID+' '+' '.join(sys.argv[1:])) table.to_ASCII(sys.stdout if name is None else name) diff --git a/processing/post/scaleData.py b/processing/post/scaleData.py index 58f853251..c6ce0a64e 100755 --- a/processing/post/scaleData.py +++ b/processing/post/scaleData.py @@ -43,9 +43,7 @@ for name in filenames: damask.util.report(scriptName,name) table = damask.Table.from_ASCII(StringIO(''.join(sys.stdin.read())) if name is None else name) - for i,label in enumerate(options.labels): - table.set(label, - table.get(label)*float(options.factor[i]), - scriptID+' '+' '.join(sys.argv[1:])) + for label,factor in zip(options.labels,options.factor): + table.set(label,table.get(label)*float(factor),scriptID+' '+' '.join(sys.argv[1:])) table.to_ASCII(sys.stdout if name is None else name) diff --git a/processing/post/shiftData.py b/processing/post/shiftData.py index 57b20fbd0..341a78c7e 100755 --- a/processing/post/shiftData.py +++ b/processing/post/shiftData.py @@ -43,9 +43,7 @@ for name in filenames: damask.util.report(scriptName,name) table = damask.Table.from_ASCII(StringIO(''.join(sys.stdin.read())) if name is None else name) - for i,label in enumerate(options.labels): - table.set(label, - table.get(label)+float(options.offset[i]), - scriptID+' '+' '.join(sys.argv[1:])) + for label,offset in zip(options.labels,options.offset): + table.set(label,table.get(label)+float(offset),scriptID+' '+' '.join(sys.argv[1:])) table.to_ASCII(sys.stdout if name is None else name)