From 7c9d344601988ac5283cf2eef5310fc29b5c6b10 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 27 Jan 2016 17:06:00 +0000 Subject: [PATCH] python files now report their version depending on VERSION file in $DAMASK_ROOT --- processing/misc/ang_toTable.py | 4 ++-- processing/misc/calculateAnisotropy.py | 4 ++-- processing/misc/gwyddion_filter.py | 4 ++-- processing/misc/vtk_fromGwyddion.py | 4 ++-- processing/misc/yieldSurface.py | 4 ++-- processing/post/3Dvisualize.py | 4 ++-- processing/post/addAPS34IDEstrainCoords.py | 4 ++-- processing/post/addCalculation.py | 4 ++-- processing/post/addCauchy.py | 4 ++-- processing/post/addCompatibilityMismatch.py | 4 ++-- processing/post/addCumulative.py | 4 ++-- processing/post/addCurl.py | 4 ++-- processing/post/addDeformedConfiguration.py | 4 ++-- processing/post/addDeterminant.py | 4 ++-- processing/post/addDeviator.py | 4 ++-- processing/post/addDivergence.py | 4 ++-- processing/post/addEhkl.py | 4 ++-- processing/post/addEuclideanDistance.py | 4 ++-- processing/post/addGrainID.py | 4 ++-- processing/post/addIPFcolor.py | 4 ++-- processing/post/addMapped.py | 4 ++-- processing/post/addMises.py | 4 ++-- processing/post/addNorm.py | 4 ++-- processing/post/addOrientations.py | 4 ++-- processing/post/addPK2.py | 4 ++-- processing/post/addPole.py | 4 ++-- processing/post/addQuaternions.py | 4 ++-- processing/post/addSchmidfactors.py | 4 ++-- processing/post/addSpectralDecomposition.py | 4 ++-- processing/post/addStrainTensors.py | 4 ++-- processing/post/addTable.py | 4 ++-- processing/post/averageDown.py | 4 ++-- processing/post/averageTable.py | 4 ++-- processing/post/binXY.py | 4 ++-- processing/post/blowUp.py | 4 ++-- processing/post/fillTable.py | 4 ++-- processing/post/filterTable.py | 4 ++-- processing/post/imageData.py | 4 ++-- processing/post/imageDataDeformed.py | 4 ++-- processing/post/imageDataRGB.py | 4 ++-- processing/post/marc_deformedGeometry.py | 4 ++-- processing/post/marc_extractData.py | 4 ++-- processing/post/mentat_colorMap.py | 4 ++-- processing/post/perceptualUniformColorMap.py | 4 ++-- processing/post/permuteData.py | 4 ++-- processing/post/postResults.py | 4 ++-- processing/post/reLabel.py | 4 ++-- processing/post/rotateData.py | 4 ++-- processing/post/scaleData.py | 4 ++-- processing/post/shiftData.py | 4 ++-- processing/post/showTable.py | 4 ++-- processing/post/sortTable.py | 4 ++-- processing/post/stddevDown.py | 4 ++-- processing/post/vtk2ang.py | 4 ++-- processing/post/vtk_addData.py | 4 ++-- processing/post/vtk_addPointcloudData.py | 4 ++-- processing/post/vtk_addRectilinearGridData.py | 4 ++-- processing/post/vtk_addVoxelcloudData.py | 4 ++-- processing/post/vtk_pointcloud.py | 4 ++-- processing/post/vtk_rectilinearGrid.py | 4 ++-- processing/post/vtk_scalars2vectors.py | 4 ++-- processing/post/vtk_voxelcloud.py | 4 ++-- processing/pre/OIMlinear2linearODF.py | 4 ++-- processing/pre/abq_addUserOutput.py | 4 ++-- processing/pre/geom_addPrimitive.py | 4 ++-- processing/pre/geom_canvas.py | 4 ++-- processing/pre/geom_check.py | 4 ++-- processing/pre/geom_clean.py | 4 ++-- processing/pre/geom_fromAng.py | 4 ++-- processing/pre/geom_fromBarycentric.py | 4 ++-- processing/pre/geom_fromEuclideanDistance.py | 4 ++-- processing/pre/geom_fromImage.py | 4 ++-- processing/pre/geom_fromMinimalSurface.py | 4 ++-- processing/pre/geom_fromOsteonGeometry.py | 4 ++-- processing/pre/geom_fromTable.py | 4 ++-- processing/pre/geom_fromVPSC.py | 4 ++-- processing/pre/geom_fromVoronoiTessellation.py | 4 ++-- processing/pre/geom_grainGrowth.py | 4 ++-- processing/pre/geom_pack.py | 4 ++-- processing/pre/geom_rescale.py | 4 ++-- processing/pre/geom_rotate.py | 4 ++-- processing/pre/geom_toTable.py | 4 ++-- processing/pre/geom_translate.py | 4 ++-- processing/pre/geom_unpack.py | 4 ++-- processing/pre/geom_vicinityOffset.py | 4 ++-- processing/pre/gmsh_identifySurfaces.py | 4 ++-- processing/pre/hybridIA_linODFsampling.py | 4 ++-- processing/pre/marc_addUserOutput.py | 4 ++-- processing/pre/mentat_pbcOnBoxMesh.py | 4 ++-- processing/pre/mentat_spectralBox.py | 4 ++-- processing/pre/patchFromReconstructedBoundaries.py | 4 ++-- processing/pre/seeds_check.py | 4 ++-- processing/pre/seeds_fromDistribution.py | 4 ++-- processing/pre/seeds_fromGeom.py | 4 ++-- processing/pre/seeds_fromPokes.py | 4 ++-- processing/pre/seeds_fromRandom.py | 4 ++-- processing/pre/seeds_fromTable.py | 4 ++-- 97 files changed, 194 insertions(+), 194 deletions(-) diff --git a/processing/misc/ang_toTable.py b/processing/misc/ang_toTable.py index 4b1c475c0..8820c514a 100755 --- a/processing/misc/ang_toTable.py +++ b/processing/misc/ang_toTable.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- diff --git a/processing/misc/calculateAnisotropy.py b/processing/misc/calculateAnisotropy.py index 5276937c7..d93431f50 100644 --- a/processing/misc/calculateAnisotropy.py +++ b/processing/misc/calculateAnisotropy.py @@ -8,8 +8,8 @@ from shutil import copy2 from re import split import damask -scriptID = string.replace('$Id: yieldSurface.py 3942 2015-02-25 17:24:33Z MPIE\hm.zhang $','\n','\\n') -scriptName = scriptID.split()[1][:-3] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def list_split(option, opt, value, parser): setattr(parser.values, option.dest, value.split(',')) diff --git a/processing/misc/gwyddion_filter.py b/processing/misc/gwyddion_filter.py index 2a1937368..100c61976 100755 --- a/processing/misc/gwyddion_filter.py +++ b/processing/misc/gwyddion_filter.py @@ -5,8 +5,8 @@ import os,sys,string,re,numpy,scipy.ndimage,scipy.signal,vtk import damask from optparse import OptionParser, OptionGroup, Option, SUPPRESS_HELP -scriptID = '$Id$' -scriptName = scriptID.split()[1] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- class extendedOption(Option): diff --git a/processing/misc/vtk_fromGwyddion.py b/processing/misc/vtk_fromGwyddion.py index 344e885b1..398999c75 100755 --- a/processing/misc/vtk_fromGwyddion.py +++ b/processing/misc/vtk_fromGwyddion.py @@ -5,8 +5,8 @@ import os,sys,string,re,numpy,scipy.ndimage,scipy.signal,vtk import damask from optparse import OptionParser, OptionGroup, Option, SUPPRESS_HELP -scriptID = '$Id$' -scriptName = scriptID.split()[1] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) scalingFactor = { \ 'm': { diff --git a/processing/misc/yieldSurface.py b/processing/misc/yieldSurface.py index c44e34939..b6ca40265 100755 --- a/processing/misc/yieldSurface.py +++ b/processing/misc/yieldSurface.py @@ -7,8 +7,8 @@ from optparse import OptionParser import damask from damask.util import leastsqBound -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def runFit(exponent, eqStress, dimension, criterion): global s, threads, myFit, myLoad diff --git a/processing/post/3Dvisualize.py b/processing/post/3Dvisualize.py index bef540d0e..8abfe9676 100755 --- a/processing/post/3Dvisualize.py +++ b/processing/post/3Dvisualize.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def outStdout(cmd,locals): if cmd[0:3] == '(!)': diff --git a/processing/post/addAPS34IDEstrainCoords.py b/processing/post/addAPS34IDEstrainCoords.py index 42cdaa26f..2dcfaa98f 100755 --- a/processing/post/addAPS34IDEstrainCoords.py +++ b/processing/post/addAPS34IDEstrainCoords.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id: addAPS34IDEstrainCoord.py 3828M 2015-05-16 07:28:21Z (local) $','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- diff --git a/processing/post/addCalculation.py b/processing/post/addCalculation.py index 7dd54d6f8..dea3932e9 100755 --- a/processing/post/addCalculation.py +++ b/processing/post/addCalculation.py @@ -7,8 +7,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def unravel(item): if hasattr(item,'__contains__'): return ' '.join(map(unravel,item)) diff --git a/processing/post/addCauchy.py b/processing/post/addCauchy.py index ccf66b8aa..4dd1843bf 100755 --- a/processing/post/addCauchy.py +++ b/processing/post/addCauchy.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/addCompatibilityMismatch.py b/processing/post/addCompatibilityMismatch.py index 899b59d12..6c90fe0e4 100755 --- a/processing/post/addCompatibilityMismatch.py +++ b/processing/post/addCompatibilityMismatch.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/addCumulative.py b/processing/post/addCumulative.py index 6f9f5e1e9..2233a784e 100755 --- a/processing/post/addCumulative.py +++ b/processing/post/addCumulative.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/addCurl.py b/processing/post/addCurl.py index cb5198bb0..6e2affd9a 100755 --- a/processing/post/addCurl.py +++ b/processing/post/addCurl.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def curlFFT(geomdim,field): N = grid.prod() # field size diff --git a/processing/post/addDeformedConfiguration.py b/processing/post/addDeformedConfiguration.py index 23eb9f94f..0f5a5abc0 100755 --- a/processing/post/addDeformedConfiguration.py +++ b/processing/post/addDeformedConfiguration.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- def deformedCoordsFFT(F,undeformed=False): diff --git a/processing/post/addDeterminant.py b/processing/post/addDeterminant.py index ec4ec615b..263133bfa 100755 --- a/processing/post/addDeterminant.py +++ b/processing/post/addDeterminant.py @@ -5,8 +5,8 @@ import os,sys,string from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def determinant(m): return +m[0]*m[4]*m[8] \ diff --git a/processing/post/addDeviator.py b/processing/post/addDeviator.py index bffa1f4f2..bc6319c7e 100755 --- a/processing/post/addDeviator.py +++ b/processing/post/addDeviator.py @@ -5,8 +5,8 @@ import os,sys,string from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) oneThird = 1.0/3.0 diff --git a/processing/post/addDivergence.py b/processing/post/addDivergence.py index cb03db6f1..b661b647b 100755 --- a/processing/post/addDivergence.py +++ b/processing/post/addDivergence.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def divFFT(geomdim,field): N = grid.prod() # field size diff --git a/processing/post/addEhkl.py b/processing/post/addEhkl.py index 3bbef8411..1e8688518 100755 --- a/processing/post/addEhkl.py +++ b/processing/post/addEhkl.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def normalize(vec): return vec/np.sqrt(np.inner(vec,vec)) diff --git a/processing/post/addEuclideanDistance.py b/processing/post/addEuclideanDistance.py index 58d992a6c..8139e7536 100755 --- a/processing/post/addEuclideanDistance.py +++ b/processing/post/addEuclideanDistance.py @@ -7,8 +7,8 @@ from scipy import ndimage from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def periodic_3Dpad(array, rimdim=(1,1,1)): diff --git a/processing/post/addGrainID.py b/processing/post/addGrainID.py index 5ead48de9..384d161ae 100755 --- a/processing/post/addGrainID.py +++ b/processing/post/addGrainID.py @@ -7,8 +7,8 @@ from optparse import OptionParser from scipy import spatial from collections import defaultdict -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) parser = OptionParser(option_class=damask.extendableOption, usage='%prog options [file[s]]', description = """ diff --git a/processing/post/addIPFcolor.py b/processing/post/addIPFcolor.py index 44b0ed4c5..da45c1288 100755 --- a/processing/post/addIPFcolor.py +++ b/processing/post/addIPFcolor.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/addMapped.py b/processing/post/addMapped.py index ed7e838ab..cf3419745 100755 --- a/processing/post/addMapped.py +++ b/processing/post/addMapped.py @@ -5,8 +5,8 @@ import os,sys,string from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/addMises.py b/processing/post/addMises.py index 01b87051b..910f26c70 100755 --- a/processing/post/addMises.py +++ b/processing/post/addMises.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def Mises(what,tensor): diff --git a/processing/post/addNorm.py b/processing/post/addNorm.py index 8e1772c2b..df2fa11f8 100755 --- a/processing/post/addNorm.py +++ b/processing/post/addNorm.py @@ -5,8 +5,8 @@ import os,sys,math,string from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # definition of element-wise p-norms for matrices diff --git a/processing/post/addOrientations.py b/processing/post/addOrientations.py index 57140a6ff..91b4dbc8a 100755 --- a/processing/post/addOrientations.py +++ b/processing/post/addOrientations.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/addPK2.py b/processing/post/addPK2.py index 87256f70c..82dc5a26c 100755 --- a/processing/post/addPK2.py +++ b/processing/post/addPK2.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/addPole.py b/processing/post/addPole.py index 0892dca02..9228058a2 100755 --- a/processing/post/addPole.py +++ b/processing/post/addPole.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/addQuaternions.py b/processing/post/addQuaternions.py index 88b0e102f..185d11a64 100755 --- a/processing/post/addQuaternions.py +++ b/processing/post/addQuaternions.py @@ -5,8 +5,8 @@ import os,sys,string,numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- diff --git a/processing/post/addSchmidfactors.py b/processing/post/addSchmidfactors.py index a606b03f0..30d3d6f4a 100755 --- a/processing/post/addSchmidfactors.py +++ b/processing/post/addSchmidfactors.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) slipnormal_temp = [ [0,0,0,1], diff --git a/processing/post/addSpectralDecomposition.py b/processing/post/addSpectralDecomposition.py index 7b36bf4ab..3372e35f6 100755 --- a/processing/post/addSpectralDecomposition.py +++ b/processing/post/addSpectralDecomposition.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/addStrainTensors.py b/processing/post/addStrainTensors.py index 952b721b8..b8e1fc9cc 100755 --- a/processing/post/addStrainTensors.py +++ b/processing/post/addStrainTensors.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def operator(stretch,strain,eigenvalues): ''' Albrecht Bertram: Elasticity and Plasticity of Large Deformations An Introduction (3rd Edition, 2012), p. 102 ''' diff --git a/processing/post/addTable.py b/processing/post/addTable.py index 91c49f0da..1e94319b2 100755 --- a/processing/post/addTable.py +++ b/processing/post/addTable.py @@ -5,8 +5,8 @@ import os,sys,string from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/averageDown.py b/processing/post/averageDown.py index c815e73b4..0632a7844 100755 --- a/processing/post/averageDown.py +++ b/processing/post/averageDown.py @@ -7,8 +7,8 @@ import scipy.ndimage from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/averageTable.py b/processing/post/averageTable.py index ee81aded0..b3d99f49d 100755 --- a/processing/post/averageTable.py +++ b/processing/post/averageTable.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/binXY.py b/processing/post/binXY.py index ec3503eda..d9f0cb25a 100755 --- a/processing/post/binXY.py +++ b/processing/post/binXY.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/blowUp.py b/processing/post/blowUp.py index 5aee36ab5..f108da28e 100755 --- a/processing/post/blowUp.py +++ b/processing/post/blowUp.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/fillTable.py b/processing/post/fillTable.py index 772526386..120f4eb8d 100755 --- a/processing/post/fillTable.py +++ b/processing/post/fillTable.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = '$Id$' -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def unravel(item): if hasattr(item,'__contains__'): return ' '.join(map(unravel,item)) diff --git a/processing/post/filterTable.py b/processing/post/filterTable.py index 1ebf6a238..87a95750c 100755 --- a/processing/post/filterTable.py +++ b/processing/post/filterTable.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = '$Id$' -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def sortingList(labels,whitelistitems): diff --git a/processing/post/imageData.py b/processing/post/imageData.py index 5f123cd85..da1616e94 100755 --- a/processing/post/imageData.py +++ b/processing/post/imageData.py @@ -7,8 +7,8 @@ from optparse import OptionParser from PIL import Image import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/imageDataDeformed.py b/processing/post/imageDataDeformed.py index 41df4b38b..692d377f4 100755 --- a/processing/post/imageDataDeformed.py +++ b/processing/post/imageDataDeformed.py @@ -7,8 +7,8 @@ from optparse import OptionParser from PIL import Image, ImageDraw import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/imageDataRGB.py b/processing/post/imageDataRGB.py index cdc690610..69310f529 100755 --- a/processing/post/imageDataRGB.py +++ b/processing/post/imageDataRGB.py @@ -7,8 +7,8 @@ from optparse import OptionParser from PIL import Image import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/marc_deformedGeometry.py b/processing/post/marc_deformedGeometry.py index d0821322f..e59c982a6 100755 --- a/processing/post/marc_deformedGeometry.py +++ b/processing/post/marc_deformedGeometry.py @@ -6,8 +6,8 @@ import numpy as np import damask from optparse import OptionParser -scriptID = '$Id$' -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # ----------------------------- # MAIN FUNCTION STARTS HERE diff --git a/processing/post/marc_extractData.py b/processing/post/marc_extractData.py index 3c50b8840..1e5b76f60 100755 --- a/processing/post/marc_extractData.py +++ b/processing/post/marc_extractData.py @@ -5,8 +5,8 @@ import os,sys,string,re,time from optparse import OptionParser, OptionGroup import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # ----------------------------- def ParseOutputFormat(filename,homogID,crystID,phaseID): diff --git a/processing/post/mentat_colorMap.py b/processing/post/mentat_colorMap.py index a0e96d94c..8e630df9d 100755 --- a/processing/post/mentat_colorMap.py +++ b/processing/post/mentat_colorMap.py @@ -5,8 +5,8 @@ import os, sys, string import damask from optparse import OptionParser -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # ----------------------------- def outMentat(cmd,locals): diff --git a/processing/post/perceptualUniformColorMap.py b/processing/post/perceptualUniformColorMap.py index c8f3cb20f..f84928f23 100755 --- a/processing/post/perceptualUniformColorMap.py +++ b/processing/post/perceptualUniformColorMap.py @@ -5,8 +5,8 @@ import string,sys,os import damask from optparse import OptionParser -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/permuteData.py b/processing/post/permuteData.py index 104e48b35..f873ca447 100755 --- a/processing/post/permuteData.py +++ b/processing/post/permuteData.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/postResults.py b/processing/post/postResults.py index dc22359bb..0dfca8279 100755 --- a/processing/post/postResults.py +++ b/processing/post/postResults.py @@ -5,8 +5,8 @@ import os,sys,math,re,threading,time,struct,string import damask from optparse import OptionParser, OptionGroup -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) fileExtensions = { \ diff --git a/processing/post/reLabel.py b/processing/post/reLabel.py index d19a6d9e5..d74080efb 100755 --- a/processing/post/reLabel.py +++ b/processing/post/reLabel.py @@ -5,8 +5,8 @@ import os,sys,string import damask from optparse import OptionParser -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/rotateData.py b/processing/post/rotateData.py index dfd007167..42e24579a 100755 --- a/processing/post/rotateData.py +++ b/processing/post/rotateData.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/scaleData.py b/processing/post/scaleData.py index 7b07ab50b..0b1a48553 100755 --- a/processing/post/scaleData.py +++ b/processing/post/scaleData.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = '$Id$' -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/shiftData.py b/processing/post/shiftData.py index 4d54e579e..22b76f7d1 100755 --- a/processing/post/shiftData.py +++ b/processing/post/shiftData.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = '$Id$' -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/showTable.py b/processing/post/showTable.py index 471cb5b18..02946437b 100755 --- a/processing/post/showTable.py +++ b/processing/post/showTable.py @@ -5,8 +5,8 @@ import os from optparse import OptionParser import damask -scriptID = '$Id$' -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/sortTable.py b/processing/post/sortTable.py index 63aaa9e6a..4735062dc 100755 --- a/processing/post/sortTable.py +++ b/processing/post/sortTable.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/stddevDown.py b/processing/post/stddevDown.py index 98ca221e1..880961511 100755 --- a/processing/post/stddevDown.py +++ b/processing/post/stddevDown.py @@ -6,8 +6,8 @@ import numpy as np import damask from optparse import OptionParser -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/vtk2ang.py b/processing/post/vtk2ang.py index 7a00286ec..639158293 100755 --- a/processing/post/vtk2ang.py +++ b/processing/post/vtk2ang.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser from vtk import * -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # ----------------------------- def getHeader(filename,sizeFastIndex,sizeSlowIndex,stepsize): diff --git a/processing/post/vtk_addData.py b/processing/post/vtk_addData.py index 2f98ebfdc..b93f6e174 100755 --- a/processing/post/vtk_addData.py +++ b/processing/post/vtk_addData.py @@ -5,8 +5,8 @@ import os,string,glob,re import damask from optparse import OptionParser -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # ----------------------------- def findTag(filename,tag): diff --git a/processing/post/vtk_addPointcloudData.py b/processing/post/vtk_addPointcloudData.py index 187fa7372..2dfbdd144 100755 --- a/processing/post/vtk_addPointcloudData.py +++ b/processing/post/vtk_addPointcloudData.py @@ -5,8 +5,8 @@ import os,sys,string,vtk import damask from optparse import OptionParser -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/vtk_addRectilinearGridData.py b/processing/post/vtk_addRectilinearGridData.py index 813cad4bd..b1e35d2cd 100755 --- a/processing/post/vtk_addRectilinearGridData.py +++ b/processing/post/vtk_addRectilinearGridData.py @@ -6,8 +6,8 @@ import damask from collections import defaultdict from optparse import OptionParser -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/vtk_addVoxelcloudData.py b/processing/post/vtk_addVoxelcloudData.py index 934a7d032..61dfb0581 100755 --- a/processing/post/vtk_addVoxelcloudData.py +++ b/processing/post/vtk_addVoxelcloudData.py @@ -6,8 +6,8 @@ import damask from collections import defaultdict from optparse import OptionParser -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/vtk_pointcloud.py b/processing/post/vtk_pointcloud.py index 9958bdd68..b49c75c10 100755 --- a/processing/post/vtk_pointcloud.py +++ b/processing/post/vtk_pointcloud.py @@ -6,8 +6,8 @@ import numpy as np import damask from optparse import OptionParser -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/vtk_rectilinearGrid.py b/processing/post/vtk_rectilinearGrid.py index 2d5b5693d..758e4df22 100755 --- a/processing/post/vtk_rectilinearGrid.py +++ b/processing/post/vtk_rectilinearGrid.py @@ -7,8 +7,8 @@ import damask from optparse import OptionParser -scriptID = '$Id$' -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/vtk_scalars2vectors.py b/processing/post/vtk_scalars2vectors.py index 885be7c9d..72b59588c 100755 --- a/processing/post/vtk_scalars2vectors.py +++ b/processing/post/vtk_scalars2vectors.py @@ -6,8 +6,8 @@ import damask from optparse import OptionParser from vtk import * -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/post/vtk_voxelcloud.py b/processing/post/vtk_voxelcloud.py index 17a2ed495..47eb4df1a 100755 --- a/processing/post/vtk_voxelcloud.py +++ b/processing/post/vtk_voxelcloud.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = '$Id$' -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- diff --git a/processing/pre/OIMlinear2linearODF.py b/processing/pre/OIMlinear2linearODF.py index c887af903..980f861af 100755 --- a/processing/pre/OIMlinear2linearODF.py +++ b/processing/pre/OIMlinear2linearODF.py @@ -6,8 +6,8 @@ from optparse import OptionParser import numpy as np import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = scriptID.split()[1] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) sampleSym = { 'Orthotropic' : (90,90,90), 'Triclinic' : (360,180,360) diff --git a/processing/pre/abq_addUserOutput.py b/processing/pre/abq_addUserOutput.py index 537587169..b14399509 100755 --- a/processing/pre/abq_addUserOutput.py +++ b/processing/pre/abq_addUserOutput.py @@ -14,8 +14,8 @@ import sys,os,re,string from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # ----------------------------- def ParseOutputFormat(filename,what,me): diff --git a/processing/pre/geom_addPrimitive.py b/processing/pre/geom_addPrimitive.py index 875c62f07..9200f2df7 100755 --- a/processing/pre/geom_addPrimitive.py +++ b/processing/pre/geom_addPrimitive.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) oversampling = 2. diff --git a/processing/pre/geom_canvas.py b/processing/pre/geom_canvas.py index 54b2ab692..93df742da 100755 --- a/processing/pre/geom_canvas.py +++ b/processing/pre/geom_canvas.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/pre/geom_check.py b/processing/pre/geom_check.py index 60796b0d5..3f9e50864 100755 --- a/processing/pre/geom_check.py +++ b/processing/pre/geom_check.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- # MAIN diff --git a/processing/pre/geom_clean.py b/processing/pre/geom_clean.py index 7520cf89d..b55149a61 100755 --- a/processing/pre/geom_clean.py +++ b/processing/pre/geom_clean.py @@ -8,8 +8,8 @@ from scipy import ndimage from optparse import OptionParser from collections import defaultdict -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def mostFrequent(arr): d = defaultdict(int) diff --git a/processing/pre/geom_fromAng.py b/processing/pre/geom_fromAng.py index 7be1c5f7c..3cf031db8 100755 --- a/processing/pre/geom_fromAng.py +++ b/processing/pre/geom_fromAng.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- # MAIN diff --git a/processing/pre/geom_fromBarycentric.py b/processing/pre/geom_fromBarycentric.py index 53b63a4a2..383681ef9 100755 --- a/processing/pre/geom_fromBarycentric.py +++ b/processing/pre/geom_fromBarycentric.py @@ -15,8 +15,8 @@ import numpy as np import argparse from scipy.spatial import Delaunay -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) OFFSET = 0.1 #resize the seeded volume to give space for rim/pan diff --git a/processing/pre/geom_fromEuclideanDistance.py b/processing/pre/geom_fromEuclideanDistance.py index f121f49af..405fca630 100755 --- a/processing/pre/geom_fromEuclideanDistance.py +++ b/processing/pre/geom_fromEuclideanDistance.py @@ -7,8 +7,8 @@ from scipy import ndimage from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def periodic_3Dpad(array, rimdim=(1,1,1)): diff --git a/processing/pre/geom_fromImage.py b/processing/pre/geom_fromImage.py index 83185fb38..5ef524dcb 100755 --- a/processing/pre/geom_fromImage.py +++ b/processing/pre/geom_fromImage.py @@ -7,8 +7,8 @@ from optparse import OptionParser from PIL import Image,ImageOps import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- # MAIN diff --git a/processing/pre/geom_fromMinimalSurface.py b/processing/pre/geom_fromMinimalSurface.py index 9d2953b2f..915f1f9f3 100755 --- a/processing/pre/geom_fromMinimalSurface.py +++ b/processing/pre/geom_fromMinimalSurface.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/pre/geom_fromOsteonGeometry.py b/processing/pre/geom_fromOsteonGeometry.py index 660058c33..9e8280a72 100755 --- a/processing/pre/geom_fromOsteonGeometry.py +++ b/processing/pre/geom_fromOsteonGeometry.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/pre/geom_fromTable.py b/processing/pre/geom_fromTable.py index 08b47a7ef..68b8aa12d 100755 --- a/processing/pre/geom_fromTable.py +++ b/processing/pre/geom_fromTable.py @@ -6,8 +6,8 @@ import scipy.spatial, numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) diff --git a/processing/pre/geom_fromVPSC.py b/processing/pre/geom_fromVPSC.py index 5ea56dc5b..99762fd5e 100755 --- a/processing/pre/geom_fromVPSC.py +++ b/processing/pre/geom_fromVPSC.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- # MAIN diff --git a/processing/pre/geom_fromVoronoiTessellation.py b/processing/pre/geom_fromVoronoiTessellation.py index a51c1181c..0a6e186fe 100755 --- a/processing/pre/geom_fromVoronoiTessellation.py +++ b/processing/pre/geom_fromVoronoiTessellation.py @@ -8,8 +8,8 @@ from optparse import OptionParser from scipy import spatial import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def meshgrid2(*arrs): diff --git a/processing/pre/geom_grainGrowth.py b/processing/pre/geom_grainGrowth.py index a7674a15c..70fdc095f 100755 --- a/processing/pre/geom_grainGrowth.py +++ b/processing/pre/geom_grainGrowth.py @@ -7,8 +7,8 @@ from optparse import OptionParser from scipy import ndimage import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- # MAIN diff --git a/processing/pre/geom_pack.py b/processing/pre/geom_pack.py index ac8c0edc7..9edb8c3dc 100755 --- a/processing/pre/geom_pack.py +++ b/processing/pre/geom_pack.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- # MAIN diff --git a/processing/pre/geom_rescale.py b/processing/pre/geom_rescale.py index bf9d751c3..b0d27f474 100755 --- a/processing/pre/geom_rescale.py +++ b/processing/pre/geom_rescale.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- # MAIN diff --git a/processing/pre/geom_rotate.py b/processing/pre/geom_rotate.py index da58f81c3..ecd0da09c 100755 --- a/processing/pre/geom_rotate.py +++ b/processing/pre/geom_rotate.py @@ -7,8 +7,8 @@ import damask from scipy import ndimage from optparse import OptionParser -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- # MAIN diff --git a/processing/pre/geom_toTable.py b/processing/pre/geom_toTable.py index 80f4e6def..79ace7d24 100755 --- a/processing/pre/geom_toTable.py +++ b/processing/pre/geom_toTable.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- diff --git a/processing/pre/geom_translate.py b/processing/pre/geom_translate.py index 68a9f8be4..c6c93f0d3 100755 --- a/processing/pre/geom_translate.py +++ b/processing/pre/geom_translate.py @@ -6,8 +6,8 @@ import numpy as np import damask from optparse import OptionParser -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- # MAIN diff --git a/processing/pre/geom_unpack.py b/processing/pre/geom_unpack.py index bc437f275..43e2764b4 100755 --- a/processing/pre/geom_unpack.py +++ b/processing/pre/geom_unpack.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- # MAIN diff --git a/processing/pre/geom_vicinityOffset.py b/processing/pre/geom_vicinityOffset.py index c5dce7cef..c11188997 100755 --- a/processing/pre/geom_vicinityOffset.py +++ b/processing/pre/geom_vicinityOffset.py @@ -7,8 +7,8 @@ from scipy import ndimage from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- # MAIN diff --git a/processing/pre/gmsh_identifySurfaces.py b/processing/pre/gmsh_identifySurfaces.py index e2e66d6dc..f35579566 100755 --- a/processing/pre/gmsh_identifySurfaces.py +++ b/processing/pre/gmsh_identifySurfaces.py @@ -5,8 +5,8 @@ import os,string,re from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) def all_same(items,a): return all(x == a for x in items) diff --git a/processing/pre/hybridIA_linODFsampling.py b/processing/pre/hybridIA_linODFsampling.py index 700ab86f0..fee991aa2 100755 --- a/processing/pre/hybridIA_linODFsampling.py +++ b/processing/pre/hybridIA_linODFsampling.py @@ -6,8 +6,8 @@ import damask import os,sys,math,re,random,string import numpy as np -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # --- helper functions --- diff --git a/processing/pre/marc_addUserOutput.py b/processing/pre/marc_addUserOutput.py index 80b26b24c..b81c0d826 100755 --- a/processing/pre/marc_addUserOutput.py +++ b/processing/pre/marc_addUserOutput.py @@ -11,8 +11,8 @@ import sys,os,re,string from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # ----------------------------- def ParseOutputFormat(filename,what,me): diff --git a/processing/pre/mentat_pbcOnBoxMesh.py b/processing/pre/mentat_pbcOnBoxMesh.py index 61121e395..ca18af0b5 100755 --- a/processing/pre/mentat_pbcOnBoxMesh.py +++ b/processing/pre/mentat_pbcOnBoxMesh.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) sys.path.append(damask.solver.Marc().libraryPath('../../')) diff --git a/processing/pre/mentat_spectralBox.py b/processing/pre/mentat_spectralBox.py index ba97525b3..780698564 100755 --- a/processing/pre/mentat_spectralBox.py +++ b/processing/pre/mentat_spectralBox.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) sys.path.append(damask.solver.Marc().libraryPath('../../')) #------------------------------------------------------------------------------------------------- diff --git a/processing/pre/patchFromReconstructedBoundaries.py b/processing/pre/patchFromReconstructedBoundaries.py index 13dfacd52..9dd04f773 100755 --- a/processing/pre/patchFromReconstructedBoundaries.py +++ b/processing/pre/patchFromReconstructedBoundaries.py @@ -5,8 +5,8 @@ import sys,os,math,re,string from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) try: # check for Python Image Lib diff --git a/processing/pre/seeds_check.py b/processing/pre/seeds_check.py index fe5a15e29..7460fa9a3 100755 --- a/processing/pre/seeds_check.py +++ b/processing/pre/seeds_check.py @@ -6,8 +6,8 @@ import numpy as np import damask from optparse import OptionParser -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- # MAIN diff --git a/processing/pre/seeds_fromDistribution.py b/processing/pre/seeds_fromDistribution.py index 569bb3e2f..a68c8c802 100755 --- a/processing/pre/seeds_fromDistribution.py +++ b/processing/pre/seeds_fromDistribution.py @@ -8,8 +8,8 @@ from operator import mul from cStringIO import StringIO import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) mismatch = None currentSeedsName = None diff --git a/processing/pre/seeds_fromGeom.py b/processing/pre/seeds_fromGeom.py index 8c4e0250e..b3fb1677c 100755 --- a/processing/pre/seeds_fromGeom.py +++ b/processing/pre/seeds_fromGeom.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- # MAIN diff --git a/processing/pre/seeds_fromPokes.py b/processing/pre/seeds_fromPokes.py index fdc345717..80f13c85c 100755 --- a/processing/pre/seeds_fromPokes.py +++ b/processing/pre/seeds_fromPokes.py @@ -6,8 +6,8 @@ import numpy as np import damask from optparse import OptionParser -scriptID = '$Id$' -scriptName = scriptID.split()[1] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # -------------------------------------------------------------------- # MAIN diff --git a/processing/pre/seeds_fromRandom.py b/processing/pre/seeds_fromRandom.py index 9d1754d27..a6ce90cec 100755 --- a/processing/pre/seeds_fromRandom.py +++ b/processing/pre/seeds_fromRandom.py @@ -8,8 +8,8 @@ from optparse import OptionParser,OptionGroup from scipy import spatial -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) # ------------------------------------------ aux functions --------------------------------- diff --git a/processing/pre/seeds_fromTable.py b/processing/pre/seeds_fromTable.py index d406e7916..293c1a66f 100755 --- a/processing/pre/seeds_fromTable.py +++ b/processing/pre/seeds_fromTable.py @@ -6,8 +6,8 @@ import numpy as np from optparse import OptionParser import damask -scriptID = string.replace('$Id$','\n','\\n') -scriptName = os.path.splitext(scriptID.split()[1])[0] +scriptName = os.path.splitext(os.path.basename(__file__))[0] +scriptID = ' '.join([scriptName,damask.version]) #-------------------------------------------------------------------------------------------------- # MAIN