simplified reporting using "emph"

lib/damask/asciitable.py

@@ -4,6 +4,7 @@
 
 import os,sys
 import numpy as np
+import util
 
 class ASCIItable():
   '''
@@ -67,6 +68,10 @@ class ASCIItable():
                                                   or  hasattr(what, "__iter__") else str(what))
                     +('\n' if newline else '')),
 
+# ------------------------------------------------------------------
+  def report_name(self, scriptName, fileName):
+    self.croak(util.emph(scriptName)+(': '+fileName if fileName else ''))
+
 # ------------------------------------------------------------------
   def close(self,
             dismiss = False):
@@ -530,4 +535,4 @@ class ASCIItable():
       microstructure[i:i+s] = items[:s]
       i += s
 
-    return microstructure
+    return microstructure

processing/post/addCalculation.py

@@ -55,7 +55,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name, buffered = False)
   except:
     continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header -------------------------------------------  
 

processing/post/addCauchy.py

@@ -42,7 +42,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name, buffered = False)
   except:
     continue
-  table.croak(damask.util.emph(scriptName)+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addCompatibilityMismatch.py

@@ -53,7 +53,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak(damask.util.emph(scriptName)+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addCumulative.py

@@ -39,7 +39,7 @@ for name in filenames:
   table = damask.ASCIItable(name = name,
                             buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------  
 

processing/post/addCurl.py

@@ -107,7 +107,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,buffered = False)
   except:
     continue
-  table.croak(damask.util.emph(scriptName)+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addDeformedConfiguration.py

@@ -49,7 +49,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addDeterminant.py

@@ -45,7 +45,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addDeviator.py

@@ -52,7 +52,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name, buffered = False)
   except:
     continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addDivergence.py

@@ -92,7 +92,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,buffered = False)
   except:
     continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addEhkl.py

@@ -61,7 +61,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name, buffered = False)
   except:
     continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addEuclideanDistance.py

@@ -129,7 +129,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name, buffered = False)
   except:
     continue
-  table.croak(damask.util.emph(scriptName)+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addGrainID.py

@@ -97,7 +97,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak(damask.util.emph(scriptName)+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header -------------------------------------------  
 

processing/post/addIPFcolor.py

@@ -90,7 +90,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addMapped.py

@@ -68,7 +68,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak(damask.util.emph(scriptName)+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addMises.py

@@ -56,7 +56,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addNorm.py

@@ -56,7 +56,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak(damask.util.emph(scriptName)+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addOrientations.py

@@ -101,7 +101,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addPK2.py

@@ -43,7 +43,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addPole.py

@@ -90,7 +90,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addQuaternions.py

@@ -63,7 +63,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
   table.head_read()                                                                                 # read ASCII header info
 

processing/post/addSchmidfactors.py

@@ -308,7 +308,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,buffered = False)
   except:
     continue
-  table.croak(damask.util.emph(scriptName)+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
   table.head_read()                                                                                 # read ASCII header info
   table.info_append(scriptID + '\t' + ' '.join(sys.argv[1:]))

processing/post/addSpectralDecomposition.py

@@ -38,7 +38,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addStrainTensors.py

@@ -88,7 +88,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/addTable.py

@@ -34,7 +34,7 @@ for name in filenames:
                               buffered = False)
   except: continue
 
-  table.croak(damask.util.emph(scriptName)+(': '+name if name else ''))
+  table.report_name(scriptName,name)
   tables = []
   for addTable in options.table:
     try:
@@ -74,4 +74,4 @@ for name in filenames:
 
   table.close()                                                                                     # close ASCII tables
   for addTable in tables:
-    addTable.close()
+    addTable.close()

processing/post/averageDown.py

@@ -65,7 +65,7 @@ for name in filenames:
                                                      prefix+os.path.basename(name)) if name else name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/averageTable.py

@@ -42,7 +42,7 @@ for name in filenames:
                               outname = options.label+'_averaged_'+name if name else name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ sanity checks ---------------------------------------  
 

processing/post/binXY.py

@@ -97,7 +97,7 @@ for name in filenames:
                               buffered = False)
   except:
     continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/blowUp.py

@@ -50,7 +50,7 @@ for name in filenames:
                                                      os.path.basename(name)) if name else name,
                               buffered = False)
   except: continue
-  table.croak(damask.util.emph(scriptName)+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/fillTable.py

@@ -58,7 +58,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ assemble info -----------------------------------------
 

processing/post/filterTable.py

@@ -63,7 +63,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak(damask.util.emph(scriptName)+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ assemble info ---------------------------------------  
 

processing/post/imageData.py

@@ -118,7 +118,7 @@ for name in filenames:
                               labeled = options.label != None,
                               readonly = True)
   except: continue
-  table.croak(damask.util.emph(scriptName)+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/imageDataDeformed.py

@@ -115,7 +115,7 @@ for name in filenames:
                               labeled = options.label != None,
                               readonly = True)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/imageDataRGB.py

@@ -83,7 +83,7 @@ for name in filenames:
                               labeled = options.label != None,
                               readonly = True)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/permuteData.py

@@ -45,7 +45,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/reLabel.py

@@ -41,7 +41,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------  
 

processing/post/rotateData.py

@@ -58,7 +58,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak(damask.util.emph(scriptName)+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/scaleData.py

@@ -45,7 +45,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak(damask.util.emph(scriptName)+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/shiftData.py

@@ -45,7 +45,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ read header ------------------------------------------
 

processing/post/showTable.py

@@ -66,7 +66,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False, labeled = options.labeled, readonly = True)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ output head ---------------------------------------  
 

processing/post/sortTable.py

@@ -50,7 +50,7 @@ for name in filenames:
     table = damask.ASCIItable(name = name,
                               buffered = False)
   except: continue
-  table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else ''))
+  table.report_name(scriptName,name)
 
 # ------------------------------------------ assemble header ---------------------------------------