fixed 2 small flaws in geom_fromAng, corrected stringID and stringName in all remaining files in 'pre'

processing/pre/OIMang_hex2cub.py

@@ -4,8 +4,8 @@
 import string,os,sys
 from optparse import OptionParser, Option
 
-scriptID = '$Id$'
-scriptName = scriptID.split()[1]
+scriptID   = string.replace('$Id$','\n','\\n')
+scriptName = scriptID.split()[1][:-3]
 
 #-------------------------------------------------------------------------------------------------
 class extendableOption(Option):

processing/pre/abq_addUserOutput.py

@@ -14,7 +14,7 @@ import sys,os,re,string
 from optparse import OptionParser
 import damask 
 
-scriptID = '$Id$'
+scriptID   = string.replace('$Id$','\n','\\n')
 scriptName = scriptID.split()[1][:-3]
 
 # -----------------------------

processing/pre/geom_fromAng.py

@@ -6,8 +6,8 @@ import numpy as np
 from optparse import OptionParser
 import damask
 
-scriptID = '$Id$'
-scriptName = scriptID.split()[1]
+scriptID   = string.replace('$Id$','\n','\\n')
+scriptName = scriptID.split()[1][:-3]
 
 #--------------------------------------------------------------------------------------------------
 #                                MAIN
@@ -102,7 +102,7 @@ for file in files:
           phase       = np.zeros(info['grid'][0]*info['grid'][1],dtype='i')
     else:                                                                                           # finished with comments block
       phase[point] = options.phase[int(float(words[options.column-1]) > options.threshold)]
-      eulerangles[point,...] = map(math.degrees, words[:3])
+      eulerangles[point,...] = map(lambda x: math.degrees(float(x)), words[:3])
       point += 1
  
   if info['grid'].prod() != point:
@@ -190,5 +190,6 @@ for file in files:
 #--- output finalization -------------------------------------------------------------------------- 
   if file['name'] != 'STDIN':
     file['output'].close()
+    print os.path.splitext(file['name'])[0]
     os.rename(file['name']+'_tmp',
-              os.path.splitext(file['name'])[0] + '_material.config' if options.config else '.geom')
+              os.path.splitext(file['name'])[0] +'%s'%('_material.config' if options.config else '.geom'))

processing/pre/geom_fromVPSC.py

@@ -6,8 +6,8 @@ import numpy as np
 from optparse import OptionParser
 import damask
 
-scriptID = '$Id$'
-scriptName = scriptID.split()[1]
+scriptID   = string.replace('$Id$','\n','\\n')
+scriptName = scriptID.split()[1][:-3]
 
 #--------------------------------------------------------------------------------------------------
 #                                MAIN

processing/pre/geom_fromVoronoiTessellation.py

@@ -6,8 +6,8 @@ import numpy as np
 from optparse import OptionParser
 import damask
 
-scriptID = '$Id$'
-scriptName = scriptID.split()[1]
+scriptID   = string.replace('$Id$','\n','\\n')
+scriptName = scriptID.split()[1][:-3]
 
 
 def meshgrid2(*arrs):

processing/pre/geom_grainGrowth.py

@@ -8,8 +8,8 @@ from scipy import ndimage
 from multiprocessing import Pool
 import damask
 
-scriptID = '$Id$'
-scriptName = scriptID.split()[1]
+scriptID   = string.replace('$Id$','\n','\\n')
+scriptName = scriptID.split()[1][:-3]
 
 #--------------------------------------------------------------------------------------------------
 #                                MAIN

processing/pre/geom_toTable.py

@@ -7,7 +7,7 @@ from optparse import OptionParser, OptionGroup, Option, SUPPRESS_HELP
 import damask
 
 scriptID   = string.replace('$Id$','\n','\\n')
-scriptName = os.path.splitext(scriptID.split()[1])[0]
+scriptName = scriptID.split()[1][:-3]
 
 #--------------------------------------------------------------------------------------------------
 class extendedOption(Option):

processing/pre/geom_translate.py

@@ -5,8 +5,8 @@ import os,sys,string,re,math,numpy
 import damask
 from optparse import OptionParser, OptionGroup, Option, SUPPRESS_HELP
 
-scriptID = '$Id$'
-scriptName = scriptID.split()[1]
+scriptID   = string.replace('$Id$','\n','\\n')
+scriptName = scriptID.split()[1][:-3]
 
 #--------------------------------------------------------------------------------------------------
 class extendedOption(Option):

processing/pre/geom_unpack.py

@@ -6,8 +6,8 @@ import numpy as np
 from optparse import OptionParser
 import damask
 
-scriptID = '$Id$'
-scriptName = scriptID.split()[1]
+scriptID   = string.replace('$Id$','\n','\\n')
+scriptName = scriptID.split()[1][:-3]
 
 #--------------------------------------------------------------------------------------------------
 #                                MAIN

processing/pre/geom_vicinityOffset.py

@@ -5,8 +5,8 @@ import os,sys,string,re,math,numpy, damask
 from scipy import ndimage
 from optparse import OptionParser, OptionGroup, Option, SUPPRESS_HELP
 
-scriptID = '$Id$'
-scriptName = scriptID.split()[1]
+scriptID   = string.replace('$Id$','\n','\\n')
+scriptName = scriptID.split()[1][:-3]
 
 #--------------------------------------------------------------------------------------------------
 class extendedOption(Option):

processing/pre/gmsh_identifySurfaces.py

@@ -6,8 +6,8 @@ import damask
 import re
 from optparse import OptionParser
 
-scriptID = '$Id$'
-scriptName = scriptID.split()[1]
+scriptID   = string.replace('$Id$','\n','\\n')
+scriptName = scriptID.split()[1][:-3]
 
 def all_same(items,a):
   return all(x == a for x in items)

processing/pre/marc_addUserOutput.py

@@ -10,8 +10,8 @@ that are written during the first run of the model.
 import sys,os,re
 from optparse import OptionParser
 
-scriptID = '$Id$'
-scriptName = scriptID.split()[1]
+scriptID   = string.replace('$Id$','\n','\\n')
+scriptName = scriptID.split()[1][:-3]
 
 # -----------------------------
 def ParseOutputFormat(filename,what,me):

processing/pre/mentat_pbcOnBoxMesh.py

@@ -4,8 +4,8 @@
 import sys,os,pwd,math,re,string,numpy, damask
 from optparse import OptionParser
 
-scriptID = '$Id$'
-scriptName = scriptID.split()[1]
+scriptID   = string.replace('$Id$','\n','\\n')
+scriptName = scriptID.split()[1][:-3]
 
 sys.path.append(damask.solver.Marc().libraryPath('../../'))
 

processing/pre/patchFromReconstructedBoundaries.py

@@ -4,8 +4,8 @@
 import sys,os,math,re,string, damask
 from optparse import OptionParser, OptionGroup, Option, SUPPRESS_HELP
 
-scriptID = '$Id$'
-scriptName = scriptID.split()[1]
+scriptID   = string.replace('$Id$','\n','\\n')
+scriptName = scriptID.split()[1][:-3]
 
 
 try:                                        # check for Python Image Lib

processing/pre/seeds_fromGeom.py

@@ -6,8 +6,8 @@ import numpy as np
 from optparse import OptionParser
 import damask
 
-scriptID = '$Id$'
-scriptName = scriptID.split()[1]
+scriptID   = string.replace('$Id$','\n','\\n')
+scriptName = scriptID.split()[1][:-3]
 
 #--------------------------------------------------------------------------------------------------
 #                                MAIN