Changeset 3175

Timestamp:

Dec 6, 2017 9:19:46 AM (4 years ago)

Author:

vondreele

Message:

correct plotting errors in PlotPeakWidths?, add cursor report of position & update plot after inst parm changes to profile shape.

Location:

trunk

Files:

• GSASIIplot.py (modified) (6 diffs)
• GSASIIpwdGUI.py (modified) (2 diffs)

trunk/GSASIIplot.py

@@ -71 +71 @@
 npatand = lambda x: 180.*np.arctan(x)/np.pi
 npatan2d = lambda x,y: 180.*np.arctan2(x,y)/np.pi
+sq8ln2 = np.sqrt(8.0*np.log(2.0))
 if '2' in platform.python_version_tuple()[0]:
     GkDelta = unichr(0x0394)
     Gkrho = unichr(0x03C1)
     super2 = unichr(0xb2)
+    Angstr = unichr(0x00c5)
+    Pwrm1 = unichr(0x207b)+unichr(0x0b9)
 else:
     GkDelta = chr(0x0394)
     Gkrho = chr(0x03C1)
     super2 = chr(0xb2)
+    Angstr = chr(0x00c5)
+    Pwrm1 = chr(0x207b)+chr(0x0b9)
 nxs = np.newaxis
 #    GSASIIpath.IPyBreak()
@@ -3417 +3422 @@
 #    gamFW = lambda s,g: np.exp(np.log(s**5+2.69269*s**4*g+2.42843*s**3*g**2+4.47163*s**2*g**3+0.07842*s*g**4+g**5)/5.)
 #    gamFW2 = lambda s,g: math.sqrt(s**2+(0.4654996*g)**2)+.5345004*g  #Ubaldo Bafile - private communication
+    def OnMotion(event):
+        xpos = event.xdata
+        if xpos:                                        #avoid out of frame mouse position
+            ypos = event.ydata
+            G2frame.G2plotNB.status.SetStatusText('q =%.3f%s %sq/q =%.4f'%(xpos,Angstr+Pwrm1,GkDelta,ypos),1)                   
+
     if PatternName:
         G2frame.PatternId = G2gd.GetGPXtreeItemId(G2frame, G2frame.root, PatternName)
@@ -3445 +3456 @@
     xylim = []
     new,plotNum,Page,Plot,lim = G2frame.G2plotNB.FindPlotTab('Peak Widths','mpl')
+    Page.canvas.mpl_connect('motion_notify_event', OnMotion)
     if not new:
         if not G2frame.G2plotNB.allowZoomReset: # save previous limits
@@ -3472 +3484 @@
         s = np.sqrt(data[4])*np.pi/18000.   #var -> sig(radians)
         g = data[6]*np.pi/18000.    #centideg -> radians
-        G = G2pwd.getgamFW(g,s)/2.  #delt-theta
-        Y = s/nptand(X/2.)
+        G = G2pwd.getgamFW(g,s)     #/2.  #delt-theta from TCH fxn
+        Y = sq8ln2*s/nptand(X/2.)
         Z = g/nptand(X/2.)
         W = G/nptand(X/2.)
@@ -3483 +3495 @@
         sf = np.sqrt(fit[4])*np.pi/18000.
         gf = fit[6]*np.pi/18000.
-        Gf = G2pwd.getgamFW(gf,sf)/2.
-        Yf = sf/nptand(X/2.)
+        Gf = G2pwd.getgamFW(gf,sf)      #/2.
+        Yf = sq8ln2*sf/nptand(X/2.)
         Zf = gf/nptand(X/2.)
         Wf = Gf/nptand(X/2.)
@@ -3502 +3514 @@
                 s = 0.01
             g = peak[6]*math.pi/18000.
-            G = G2pwd.getgamFW(g,s)/2.
-            Y.append(s/tand(peak[0]/2.))
+            G = G2pwd.getgamFW(g,s)         #/2.
+            Y.append(sq8ln2*s/tand(peak[0]/2.))
             Z.append(g/tand(peak[0]/2.))
             W.append(G/tand(peak[0]/2.))

trunk/GSASIIpwdGUI.py

@@ -1678 +1678 @@
         updateData(insVal,insRef)
         
+    def NewProfile(invalid,value,tc):
+        if invalid: return
+        updateData(insVal,insRef)
+        G2plt.PlotPeakWidths(G2frame)
+        
     def OnItemRef(event):
         Obj = event.GetEventObject()
@@ -1804 +1809 @@
                     refFlgElem.append([item,2])
                     instSizer.Add(wx.StaticText(G2frame.dataWindow,-1,lblWdef(item,nDig[1],insDef[item])),0,WACV)
-                    itemVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,insVal,item,nDig=nDig,typeHint=float,OnLeave=AfterChange)
+                    itemVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,insVal,item,nDig=nDig,typeHint=float,OnLeave=NewProfile)
                     instSizer.Add(itemVal,0,WACV)
                     instSizer.Add(RefineBox(item),0,WACV)