Changeset 327

Timestamp:

Jul 1, 2011 12:10:28 PM (12 years ago)

Author:

vondreele

Message:

fix to path name for atomdata.dat
fix to texture display - can't have colorbars!
put in bit to show #threads used

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIElem.py (modified) (4 diffs)
• GSASIIphsGUI.py (modified) (3 diffs)
• GSASIIplot.py (modified) (6 diffs)

trunk/GSASII.py

@@ -21 +21 @@
 import wx
 import matplotlib as mpl
+import mkl
 
 # load the GSAS routines
@@ -41 +42 @@
 print "scipy:      ",sp.__version__
 print "OpenGL:     ",ogl.__version__
+print "Max threads ",mkl.get_max_threads()
 
 __version__ = '0.1.5'

trunk/GSASIIElem.py

@@ -34 +34 @@
     ElS = El.upper()
     ElS = ElS.rjust(2)
-    filename = os.path.join(sys.path[1],'atmdata.dat')
+    filename = os.path.join(os.path.split(sys.argv[0])[0],'atmdata.dat')
     try:
         FFdata = open(filename,'Ur')
@@ -84 +84 @@
     else:
         ElS = El.upper()[:1].rjust(2)
-    filename = os.path.join(sys.path[1],'atmdata.dat')
+    filename = os.path.join(os.path.split(sys.argv[0])[0],'atmdata.dat')
     try:
         FFdata = open(filename,'Ur')
@@ -131 +131 @@
     ElS = El.upper()
     ElS = ElS.ljust(2)
-    filename = os.path.join(sys.path[1],'Xsect.dat')
+    filename = os.path.join(os.path.split(sys.argv[0])[0],'Xsect.dat')
     try:
         xsec = open(filename,'Ur')
@@ -206 +206 @@
     ElS = El.upper()
     ElS = ElS.rjust(2)
-    filename = os.path.join(sys.path[1],'atmdata.dat')
+    filename = os.path.join(os.path.split(sys.argv[0])[0],'atmdata.dat')
     try:
         FFdata = open(filename,'Ur')

trunk/GSASIIphsGUI.py

@@ -1921 +1921 @@
         def OnPfType(event):
             textureData['PlotType'] = pfType.GetValue()
-            print 'before'
             UpdateDData()
-            print 'after'
-            G2plt.PlotTexture(self,data,newPlot=True)
+            G2plt.PlotTexture(self,data)
             
         def OnPFValue(event):
@@ -1946 +1944 @@
                 Obj.SetValue('%3.1f,%3.1f,%3.1f'%(xyz[0],xyz[1],xyz[2]))
                 textureData['PFxyz'] = xyz
-            G2plt.PlotTexture(self,data,newPlot=True)
+            G2plt.PlotTexture(self,data)
         
         def OnShowData(event):
@@ -2607 +2605 @@
             UpdateDData()
             G2plt.PlotStrain(self,data)
-            G2plt.PlotTexture(self,data,newPlot=True)
+            G2plt.PlotTexture(self,data,Start=True)
         elif text == 'Draw Options':
             self.dataFrame.SetMenuBar(self.dataFrame.BlankMenu)

trunk/GSASIIplot.py

@@ -1192 +1192 @@
     Page.canvas.draw()
     
-def PlotTexture(self,data,newPlot=False):
+def PlotTexture(self,data,newPlot=False,Start=False):
     '''Pole figure, inverse pole figure(?), 3D pole distribution and 3D inverse pole distribution(?)
     plotting; Need way to select  
@@ -1211 +1211 @@
     SHCoef = SHData['SH Coeff'][1]
     cell = generalData['Cell'][1:7]
-    Start = True
     
     def OnMotion(event):
@@ -1264 +1263 @@
             R = np.where(R <= 1.,2.*npasind(R*0.70710678),0.0)
             Z = np.zeros_like(R)
-            time0 = time.time()
             Z = G2lat.invpolfcal(ODFln,SGData,R,P)
-            print 'inverse time:',time.time()-time0
             Z = np.reshape(Z,(npts,npts))
             CS = Plot.contour(Y,X,Z,aspect='equal')
@@ -1272 +1269 @@
             Img = Plot.imshow(Z.T,aspect='equal',cmap='binary',extent=[-1,1,-1,1])
             if newPlot:
-                Page.figure.colorbar(Img)
+#                Page.figure.colorbar(Img)    #colorbar fails - crashes gsasii
                 newPlot = False
             Plot.set_title('Inverse pole figure for XYZ='+str(SHData['PFxyz']))
-            print 'inverse pole figure',Img
                         
         else:
@@ -1286 +1282 @@
             R = np.where(R <= 1.,2.*npasind(R*0.70710678),0.0)
             Z = np.zeros_like(R)
-            time0 = time.time()
             Z = G2lat.polfcal(ODFln,SamSym[textureData['Model']],R,P)
-            print 'polfig time:',time.time()-time0
             Z = np.reshape(Z,(npts,npts))
             CS = Plot.contour(Y,X,Z,aspect='equal')
@@ -1294 +1288 @@
             Img = Plot.imshow(Z.T,aspect='equal',cmap='binary',extent=[-1,1,-1,1])
             if newPlot:
-                Page.figure.colorbar(Img)
+#                Page.figure.colorbar(Img)    #colorbar fails - crashes gsasii
                 newPlot = False
             Plot.set_title('Pole figure for HKL='+str(SHData['PFhkl']))
-            print 'pole figure',Img
     Page.canvas.draw()
+
             
 def PlotExposedImage(self,newPlot=False,event=None):