Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development

VERSION

@@ -1 +1 @@
-v2.0.0-310-ge99784d
+v2.0.0-341-gaf4307e

lib/damask/result.py

@@ -1,8 +1,6 @@
 # -*- coding: UTF-8 no BOM -*-
 
-
 import numpy as np
-#import sys
 
 try:
   import h5py
@@ -19,19 +17,19 @@ class Result():
   def __init__(self,resultsFile):
     self.data=h5py.File(resultsFile,"r")
     self.Npoints=self.data.attrs['Number of Materialpoints']
-    print("Opened "+resultsFile+" with %i points"%self.Npoints)
+    print("Opened {} with {} points".format(resultsFile,self.Npoints))
 
   def getCrystallite(self,labels,inc,constituent=1,points=None):
-    if points is None: points = np.array(np.array(xrange(self.Npoints)))
+    if points is None: points = np.array(np.array(range(self.Npoints)))
     results = {}
     mapping=self.data['mapping/crystallite']
     for instance in self.data['increments/%s/crystallite/'%inc]:
-      dsets = self.data['increments/%s/crystallite/%s'%(inc,instance)].keys()
+      dsets = list(self.data['increments/%s/crystallite/%s'%(inc,instance)].keys())
       for label in labels:
         if label in dsets and label not in results:
           shape = np.shape(self.data['increments/%s/crystallite/%s/%s'%(inc,instance,label)])[1:]
           results[label] = np.nan*np.ones(np.array((self.Npoints,)+shape))
-    for myPoint in xrange(len(points)):
+    for myPoint in range(len(points)):
       matPoint = points[myPoint]
       pos = mapping[matPoint,constituent-1]
       if pos[0] != 0:
@@ -41,5 +39,3 @@ class Result():
         except:
           pass
     return results
-
-