diff --git a/processing/post/3Dvisualize.py b/processing/post/3Dvisualize.py index 8abfe9676..6687156b8 100755 --- a/processing/post/3Dvisualize.py +++ b/processing/post/3Dvisualize.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,re,string,fnmatch,vtk +import os,sys,re,fnmatch,vtk import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addAPS34IDEstrainCoords.py b/processing/post/addAPS34IDEstrainCoords.py index 2dcfaa98f..f90587c43 100755 --- a/processing/post/addAPS34IDEstrainCoords.py +++ b/processing/post/addAPS34IDEstrainCoords.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addCalculation.py b/processing/post/addCalculation.py index dea3932e9..f4586964b 100755 --- a/processing/post/addCalculation.py +++ b/processing/post/addCalculation.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,re,sys,string -import math # flake8: noqa +import os,re,sys +import math # noqa import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addCauchy.py b/processing/post/addCauchy.py index 4dd1843bf..3fb889eec 100755 --- a/processing/post/addCauchy.py +++ b/processing/post/addCauchy.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addCauchyX.py b/processing/post/addCauchyX.py index 982bb6961..ddd748d29 100755 --- a/processing/post/addCauchyX.py +++ b/processing/post/addCauchyX.py @@ -1,9 +1,8 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,re,sys,math,string,h5py +import os,string,h5py import numpy as np -import damask from optparse import OptionParser, Option # ----------------------------- diff --git a/processing/post/addCompatibilityMismatch.py b/processing/post/addCompatibilityMismatch.py index 6c90fe0e4..6b5e704bd 100755 --- a/processing/post/addCompatibilityMismatch.py +++ b/processing/post/addCompatibilityMismatch.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addCumulative.py b/processing/post/addCumulative.py index 2233a784e..a65677883 100755 --- a/processing/post/addCumulative.py +++ b/processing/post/addCumulative.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addCurl.py b/processing/post/addCurl.py index 6e2affd9a..17144406e 100755 --- a/processing/post/addCurl.py +++ b/processing/post/addCurl.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string,math +import os,sys,math import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addDeformedConfiguration.py b/processing/post/addDeformedConfiguration.py index 0f5a5abc0..43de48e19 100755 --- a/processing/post/addDeformedConfiguration.py +++ b/processing/post/addDeformedConfiguration.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string,math +import os,sys,math import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addDeterminant.py b/processing/post/addDeterminant.py index 263133bfa..c11eacc1f 100755 --- a/processing/post/addDeterminant.py +++ b/processing/post/addDeterminant.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys from optparse import OptionParser import damask diff --git a/processing/post/addDeviator.py b/processing/post/addDeviator.py index bc6319c7e..bcf1cc317 100755 --- a/processing/post/addDeviator.py +++ b/processing/post/addDeviator.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys from optparse import OptionParser import damask diff --git a/processing/post/addDivergence.py b/processing/post/addDivergence.py index b661b647b..35908e6a2 100755 --- a/processing/post/addDivergence.py +++ b/processing/post/addDivergence.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string,math +import os,sys,math import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addEhkl.py b/processing/post/addEhkl.py index 1e8688518..5ed585ba4 100755 --- a/processing/post/addEhkl.py +++ b/processing/post/addEhkl.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addEuclideanDistance.py b/processing/post/addEuclideanDistance.py index 8139e7536..3c15ef60b 100755 --- a/processing/post/addEuclideanDistance.py +++ b/processing/post/addEuclideanDistance.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string,itertools +import os,sys,itertools import numpy as np from scipy import ndimage from optparse import OptionParser diff --git a/processing/post/addGrainID.py b/processing/post/addGrainID.py index 384d161ae..dd69ea1e4 100755 --- a/processing/post/addGrainID.py +++ b/processing/post/addGrainID.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -import os,sys,string,time,copy +import os,sys,time,copy import numpy as np import damask from optparse import OptionParser diff --git a/processing/post/addIPFcolor.py b/processing/post/addIPFcolor.py index da45c1288..a66f55290 100755 --- a/processing/post/addIPFcolor.py +++ b/processing/post/addIPFcolor.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string,math +import os,sys,math import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addMapped.py b/processing/post/addMapped.py index cf3419745..f2dc966ab 100755 --- a/processing/post/addMapped.py +++ b/processing/post/addMapped.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys from optparse import OptionParser import damask diff --git a/processing/post/addMises.py b/processing/post/addMises.py index 910f26c70..771cb7bc4 100755 --- a/processing/post/addMises.py +++ b/processing/post/addMises.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,math,string +import os,sys,math import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addNorm.py b/processing/post/addNorm.py index df2fa11f8..725321953 100755 --- a/processing/post/addNorm.py +++ b/processing/post/addNorm.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,math,string +import os,sys,math from optparse import OptionParser import damask diff --git a/processing/post/addOrientations.py b/processing/post/addOrientations.py index 91b4dbc8a..1f5ce14e7 100755 --- a/processing/post/addOrientations.py +++ b/processing/post/addOrientations.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string,math +import os,sys,math import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addPK2.py b/processing/post/addPK2.py index 82dc5a26c..831394935 100755 --- a/processing/post/addPK2.py +++ b/processing/post/addPK2.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addPole.py b/processing/post/addPole.py index 9228058a2..f7d64f4a5 100755 --- a/processing/post/addPole.py +++ b/processing/post/addPole.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string,math +import os,sys,math import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addQuaternions.py b/processing/post/addQuaternions.py index 185d11a64..a35ab62a9 100755 --- a/processing/post/addQuaternions.py +++ b/processing/post/addQuaternions.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string,numpy as np +import os,sys,numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addSchmidfactors.py b/processing/post/addSchmidfactors.py index 30d3d6f4a..c3656a9b8 100755 --- a/processing/post/addSchmidfactors.py +++ b/processing/post/addSchmidfactors.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,math,string +import os,sys,math import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addSpectralDecomposition.py b/processing/post/addSpectralDecomposition.py index 3372e35f6..cc9bbe181 100755 --- a/processing/post/addSpectralDecomposition.py +++ b/processing/post/addSpectralDecomposition.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addStrainTensors.py b/processing/post/addStrainTensors.py index b8e1fc9cc..8cccdb2f2 100755 --- a/processing/post/addStrainTensors.py +++ b/processing/post/addStrainTensors.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/addTable.py b/processing/post/addTable.py index 1e94319b2..a0055e0b6 100755 --- a/processing/post/addTable.py +++ b/processing/post/addTable.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys from optparse import OptionParser import damask diff --git a/processing/post/averageDown.py b/processing/post/averageDown.py index 0632a7844..1b2b4f76b 100755 --- a/processing/post/averageDown.py +++ b/processing/post/averageDown.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np import scipy.ndimage from optparse import OptionParser diff --git a/processing/post/averageTable.py b/processing/post/averageTable.py index b3d99f49d..b74e2744f 100755 --- a/processing/post/averageTable.py +++ b/processing/post/averageTable.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/binXY.py b/processing/post/binXY.py index d9f0cb25a..b0118aedb 100755 --- a/processing/post/binXY.py +++ b/processing/post/binXY.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/blowUp.py b/processing/post/blowUp.py index f108da28e..04a4f91e7 100755 --- a/processing/post/blowUp.py +++ b/processing/post/blowUp.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np from optparse import OptionParser import damask @@ -55,11 +55,16 @@ for name in filenames: # ------------------------------------------ read header ------------------------------------------ table.head_read() + errors = [] # ------------------------------------------ sanity checks ---------------------------------------- - if table.label_dimension(options.coords) != 3: errors.append('coordinates {} are not a vector.'.format(options.coords)) - else: coordCol = table.label_index(options.coords) + if table.label_dimension(options.coords) != 3: + damask.util.croak('coordinates {} are not a vector.'.format(options.coords)) + table.close(dismiss = True) + continue + else: + coordCol = table.label_index(options.coords) # ------------------------------------------ assemble header -------------------------------------- diff --git a/processing/post/fillTable.py b/processing/post/fillTable.py index 120f4eb8d..5f4a307af 100755 --- a/processing/post/fillTable.py +++ b/processing/post/fillTable.py @@ -1,7 +1,8 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,re,sys,string,fnmatch,math,random +import os,re,sys +import math # noqa import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/filterTable.py b/processing/post/filterTable.py index 87a95750c..6b936644b 100755 --- a/processing/post/filterTable.py +++ b/processing/post/filterTable.py @@ -1,7 +1,8 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,re,sys,fnmatch,math,random +import os,re,sys,fnmatch +import math # noqa import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/imageData.py b/processing/post/imageData.py index da1616e94..ca64e04fe 100755 --- a/processing/post/imageData.py +++ b/processing/post/imageData.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np from optparse import OptionParser from PIL import Image diff --git a/processing/post/imageDataDeformed.py b/processing/post/imageDataDeformed.py index 692d377f4..c538627d7 100755 --- a/processing/post/imageDataDeformed.py +++ b/processing/post/imageDataDeformed.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np from optparse import OptionParser from PIL import Image, ImageDraw diff --git a/processing/post/imageDataRGB.py b/processing/post/imageDataRGB.py index 69310f529..f96ebf05d 100755 --- a/processing/post/imageDataRGB.py +++ b/processing/post/imageDataRGB.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np from optparse import OptionParser from PIL import Image diff --git a/processing/post/mentat_colorMap.py b/processing/post/mentat_colorMap.py index 8e630df9d..9b4c4c828 100755 --- a/processing/post/mentat_colorMap.py +++ b/processing/post/mentat_colorMap.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os, sys, string +import os,sys import damask from optparse import OptionParser diff --git a/processing/post/perceptualUniformColorMap.py b/processing/post/perceptualUniformColorMap.py index f84928f23..7a1ff3c50 100755 --- a/processing/post/perceptualUniformColorMap.py +++ b/processing/post/perceptualUniformColorMap.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import string,sys,os +import sys,os import damask from optparse import OptionParser diff --git a/processing/post/permuteData.py b/processing/post/permuteData.py index f873ca447..c85805d29 100755 --- a/processing/post/permuteData.py +++ b/processing/post/permuteData.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/reLabel.py b/processing/post/reLabel.py index d74080efb..b1f8b898b 100755 --- a/processing/post/reLabel.py +++ b/processing/post/reLabel.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import damask from optparse import OptionParser diff --git a/processing/post/rotateData.py b/processing/post/rotateData.py index 42e24579a..67dc9c662 100755 --- a/processing/post/rotateData.py +++ b/processing/post/rotateData.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string,math +import os,sys,math import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/sortTable.py b/processing/post/sortTable.py index 4735062dc..aa2d1ed48 100755 --- a/processing/post/sortTable.py +++ b/processing/post/sortTable.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string +import os,sys import numpy as np from optparse import OptionParser import damask diff --git a/processing/post/stddevDown.py b/processing/post/stddevDown.py index 880961511..e14ee0058 100755 --- a/processing/post/stddevDown.py +++ b/processing/post/stddevDown.py @@ -144,16 +144,12 @@ for file in files: posOffset = (shift+[0.5,0.5,0.5])*dimension/resolution elementSize = dimension/resolution*packing - elem = 1 for c in xrange(downSized[2]): for b in xrange(downSized[1]): for a in xrange(downSized[0]): datavar[a,b,c,locationCol:locationCol+3] = posOffset + [a,b,c]*elementSize - datavar[a,b,c,elemCol] = elem table.data = datavar[a,b,c,:].tolist() table.data_write() # output processed line - elem += 1 - # ------------------------------------------ output result --------------------------------------- diff --git a/processing/post/vtk_addData.py b/processing/post/vtk_addData.py index b93f6e174..2e44714ca 100755 --- a/processing/post/vtk_addData.py +++ b/processing/post/vtk_addData.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,string,glob,re +import os,glob,re import damask from optparse import OptionParser diff --git a/processing/post/vtk_addPointcloudData.py b/processing/post/vtk_addPointcloudData.py index 2dfbdd144..c0dafd63a 100755 --- a/processing/post/vtk_addPointcloudData.py +++ b/processing/post/vtk_addPointcloudData.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string,vtk +import os,sys,vtk import damask from optparse import OptionParser diff --git a/processing/post/vtk_addRectilinearGridData.py b/processing/post/vtk_addRectilinearGridData.py index b1e35d2cd..1ab2c1db1 100755 --- a/processing/post/vtk_addRectilinearGridData.py +++ b/processing/post/vtk_addRectilinearGridData.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string,vtk +import os,vtk import damask from collections import defaultdict from optparse import OptionParser diff --git a/processing/post/vtk_addVoxelcloudData.py b/processing/post/vtk_addVoxelcloudData.py index 61dfb0581..67e679cde 100755 --- a/processing/post/vtk_addVoxelcloudData.py +++ b/processing/post/vtk_addVoxelcloudData.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string,vtk +import os,sys,vtk import damask from collections import defaultdict from optparse import OptionParser diff --git a/processing/post/vtk_pointcloud.py b/processing/post/vtk_pointcloud.py index b49c75c10..5f7c5c904 100755 --- a/processing/post/vtk_pointcloud.py +++ b/processing/post/vtk_pointcloud.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string,vtk +import os,sys,vtk import numpy as np import damask from optparse import OptionParser diff --git a/processing/post/vtk_scalars2vectors.py b/processing/post/vtk_scalars2vectors.py index 72b59588c..5b1ede858 100755 --- a/processing/post/vtk_scalars2vectors.py +++ b/processing/post/vtk_scalars2vectors.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- -import os,sys,string,shutil +import os,sys,shutil import damask from optparse import OptionParser from vtk import *