Changeset 1180

Timestamp:

Jan 2, 2014 11:38:59 AM (9 years ago)

Author:

vondreele

Message:

 

Location:

trunk

Files:

• GSASIIimage.py (modified) (5 diffs)
• GSASIIimgGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (3 diffs)

trunk/GSASIIimage.py

@@ -872 +872 @@
     for ring in StrSta['d-zero']:       #get observed x,y,d points for the d-zeros
         ellipse = GetEllipse(ring['Dset'],StaControls)
-        Ring = makeRing(ring['Dset'],ellipse,ring['pixLimit'],ring['cutoff'],scalex,scaley,Image)
-        Ring = np.array(Ring).T
+        Ring = np.array(makeRing(ring['Dset'],ellipse,ring['pixLimit'],ring['cutoff'],scalex,scaley,Image)).T
         ring['ImxyObs'] = np.array(Ring[:2])      #need to apply masks to this to eliminate bad points
-        Ring[:2] = GetTthAzm(Ring[0],Ring[1],StaControls)       #convert x,y to tth,azm
+        ring['ImtaObs'] = GetTthAzm(Ring[0],Ring[1],StaControls)       #convert x,y to tth,azm
+        ring['ImtaCalc'] = np.zeros_like(ring['ImtaObs'])
         Ring[0] /= 2.                                           #convert to theta
         if len(rings):
@@ -883 +883 @@
     E = StrSta['strain']
     p0 = [E[0][0],E[1][1],E[2][2],E[0][1],E[0][2],E[1][2]]
-    E = FitStrain(rings,p0,wave,phi)
+    E,dth = FitStrain(rings,p0,wave,phi)
+    for ring in StrSta['d-zero']:
+        th,azm = ring['ImtaObs']
+        th0 = npasind(wave/(2.*ring['Dset']))
+        V = np.sum(np.sum(E*calcFij(90.,phi,azm,th0).T,axis=2),axis=1)
+        dth = 180.*V/(np.pi*10e6) #in degrees & microstrain units
+        ring['ImtaCalc'] = np.array([(th0-dth)/2,azm])
     StrSta['strain'] = E
 
@@ -891 +897 @@
     Uses parameters as defined by Bob He & Kingsley Smith, Adv. in X-Ray Anal. 41, 501 (1997)
 
-    :param omg: his omega = sample omega rotation; 0 when incident beam || sample surface, 90 when perp. to sample surface
+    :param omg: his omega = sample omega rotation; 0 when incident beam || sample surface, 
+        90 when perp. to sample surface
     :param phi: his phi = sample phi rotation; usually = 0, axis rotates with omg.
     :param azm: his chi = azimuth around incident beam
@@ -930 +937 @@
         th,azm,dsp = xyd
         th0 = npasind(wave/(2.*dsp))
-        dth = 180.*np.sum(E*calcFij(phi,0.,azm,th).T)/(np.pi*1.e6) #in degrees & microstrain units
+        V = np.sum(np.sum(E*calcFij(90.,phi,azm,th).T,axis=2),axis=1)
+        dth = 180.*V/(np.pi*10e6) #in degrees & microstrain units
         th0 += dth
-        return (th-th0)**2
+        return th-th0
         
     names = ['e11','e22','e33','e12','e13','e23']
     fmt = ['%12.2f','%12.2f','%12.2f','%12.2f','%12.2f','%12.5f']
-    p1 = [p0[0],p0[1]]   
+    p1 = [1,-1]   
     result = leastsq(strainCalc,p1,args=(rings,wave,phi),full_output=True)
     vals = list(result[0])
@@ -944 +952 @@
     StrainPrint(ValSig)
 #    return np.array([[vals[0],vals[3],vals[4]],[vals[3],vals[1],vals[5]],[vals[4],vals[5],vals[2]]])
-    return np.array([[vals[0],0,0],[0,vals[1],0],[0,0,0]])
-    
-        
+    return np.array([[vals[0],0,0],[0,vals[1],0],[0,0,0]]),result[2]['fvec']
+    
+        

trunk/GSASIIimgGUI.py

@@ -1395 +1395 @@
             G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'))
         G2img.FitStrSta(G2frame.ImageZ,data,Controls,Masks)
+        UpdateStressStrain(G2frame,data)
         G2plt.PlotExposedImage(G2frame,event=event)
+        G2plt.PlotStrain(G2frame,data,newPlot=False,type='Strain')
         
     def SamSizer():

trunk/GSASIIplot.py

@@ -1193 +1193 @@
 ################################################################################
             
-def PlotXY(G2frame,XY,newPlot=False,type=''):
+def PlotXY(G2frame,XY,XY2=None,labelX=None,labelY=None,newPlot=False,type=''):
     '''simple plot of xy data, used for diagnostic purposes
     '''
@@ -1225 +1225 @@
     G2frame.G2plotNB.status.DestroyChildren()
     Plot.set_title(type)
-    Plot.set_xlabel(r'X',fontsize=14)
-    Plot.set_ylabel(r''+type,fontsize=14)
+    if xLabel:
+        Plot.set_xlabel(r''+xLabel,fontsize=14)
+    else:
+        Plot.set_xlabel(r'X',fontsize=14)
+    if yLabel:
+        Plot.set_ylabel(r''+yLabel,fontsize=14)
+    else:
+        Plot.set_ylabel(r'Y',fontsize=14)
     colors=['b','g','r','c','m','k']
-    Ymax = 1.0
-    lenX = 0
-    X,Y = XY[:2]
-    Ymax = max(Ymax,max(Y))
-    Plot.plot(X,Y,'k',picker=False)
+    for ixy,xy in enumerate(XY):
+        X,Y = xy
+        Plot.plot(X,Y,color(ixy%6)+'+',picker=False)
+    if len(XY2):
+        for ixy,xy in enumerate(XY2):
+            X,Y = xy
+            Plot.plot(X,Y,color(ixy%6),picker=False)
+    if not newPlot:
+        Page.toolbar.push_current()
+        Plot.set_xlim(xylim[0])
+        Plot.set_ylim(xylim[1])
+        xylim = []
+        Page.toolbar.push_current()
+        Page.toolbar.draw()
+    else:
+        Page.canvas.draw()
+
+################################################################################
+##### PlotStrain
+################################################################################
+            
+def PlotStrain(G2frame,data,newPlot=False,type=''):
+    '''plot of strain data, used for diagnostic purposes
+    '''
+    def OnMotion(event):
+        xpos = event.xdata
+        if xpos:                                        #avoid out of frame mouse position
+            ypos = event.ydata
+            Page.canvas.SetCursor(wx.CROSS_CURSOR)
+            try:
+                G2frame.G2plotNB.status.SetStatusText('X =%9.3f %s =%9.3f'%(xpos,type,ypos),1)                   
+            except TypeError:
+                G2frame.G2plotNB.status.SetStatusText('Select '+type+' pattern first',1)
+
+    try:
+        plotNum = G2frame.G2plotNB.plotList.index(type)
+        Page = G2frame.G2plotNB.nb.GetPage(plotNum)
+        if not newPlot:
+            Plot = Page.figure.gca()
+            xylim = Plot.get_xlim(),Plot.get_ylim()
+        Page.figure.clf()
+        Plot = Page.figure.gca()
+    except ValueError:
+        newPlot = True
+        Plot = G2frame.G2plotNB.addMpl(type).gca()
+        plotNum = G2frame.G2plotNB.plotList.index(type)
+        Page = G2frame.G2plotNB.nb.GetPage(plotNum)
+        Page.canvas.mpl_connect('motion_notify_event', OnMotion)
+    
+    Page.Choice = None
+    Page.SetFocus()
+    G2frame.G2plotNB.status.DestroyChildren()
+    Plot.set_title(type)
+    Plot.set_xlabel(r'$\mathsf{2\theta}$',fontsize=14)
+    Plot.set_ylabel(r'Azimuth',fontsize=14)
+    colors=['b','g','r','c','m','k']
+    for N,item in enumerate(data['d-zero']):
+        X,Y = np.array(item['ImtaObs'])
+        Plot.plot(X,Y,colors[N%6]+'+',picker=False)
+        X,Y = np.array(item['ImtaCalc'])
+        Plot.plot(X,Y,colors[N%6],picker=False)
     if not newPlot:
         Page.toolbar.push_current()
@@ -2534 +2596 @@
         if G2frame.PatternTree.GetItemText(G2frame.PickId) in 'Stress/Strain':
             print 'plot stress/strain stuff'
-            for ring in StrSta['d-zero']:
+            for N,ring in enumerate(StrSta['d-zero']):
                 xring,yring = ring['ImxyObs']
-                Plot.plot(xring,yring,'r+')
-#                for xring,yring in ring['ImxyCalc'].T:
-#                    Plot.add_artist(Polygon(ring['ImxyCalc'].T,ec='b',fc='none'))
-#                    Plot.plot(xring,yring)
+                Plot.plot(xring,yring,colors[N%6]+'+')
+                for xring,yring in np.array(ring['ImxyCalc']).T:
+                    Plot.add_artist(Polygon(ring['ImxyCalc'].T,ec='b',fc='none'))
+                    Plot.plot(xring,yring)
         #masks - mask lines numbered after integration limit lines
         spots = Masks['Points']