Changeset 2731

Timestamp:

Mar 1, 2017 9:08:17 AM (6 years ago)

Author:

vondreele

Message:

add save of stress/strain ring intensities as MRD in txt file
calculate stress/strain ring intensities from 5x5 pixel blocks (was 3x3)
show sig(MRD) instead of var(MRD) in ring intensities

Location:

trunk

Files:

• GSASIIgrid.py (modified) (2 diffs)
• GSASIIimage.py (modified) (3 diffs)
• GSASIIimgGUI.py (modified) (2 diffs)

trunk/GSASIIgrid.py

@@ -104 +104 @@
 
 [ wxID_STRSTACOPY, wxID_STRSTAFIT, wxID_STRSTASAVE, wxID_STRSTALOAD,wxID_STRSTSAMPLE,
-    wxID_APPENDDZERO,wxID_STRSTAALLFIT,wxID_UPDATEDZERO,wxID_STRSTAPLOT,
-] = [wx.NewId() for item in range(9)]
+    wxID_APPENDDZERO,wxID_STRSTAALLFIT,wxID_UPDATEDZERO,wxID_STRSTAPLOT,wxID_STRRINGSAVE,
+] = [wx.NewId() for item in range(10)]
 
 [ wxID_BACKCOPY,wxID_LIMITCOPY, wxID_SAMPLECOPY, wxID_SAMPLECOPYSOME, wxID_BACKFLAGCOPY, wxID_SAMPLEFLAGCOPY,
@@ -2269 +2269 @@
         self.StrStaEdit.Append(help='Plot intensity distribution', 
             id=wxID_STRSTAPLOT, kind=wx.ITEM_NORMAL,text='Plot intensity distribution')
+        self.StrStaEdit.Append(help='Save intensity distribution', 
+            id=wxID_STRRINGSAVE, kind=wx.ITEM_NORMAL,text='Save intensity distribution')
         self.StrStaEdit.Append(help='Update d-zero from ave d-zero',
             id=wxID_UPDATEDZERO, kind=wx.ITEM_NORMAL,text='Update d-zero')        

trunk/GSASIIimage.py

@@ -214 +214 @@
     ypix = int(Ypix)
     if not w:
-        ZMax = np.sum(image[ypix-1:ypix+1,xpix-1:xpix+1])
+        ZMax = np.sum(image[ypix-2:ypix+2,xpix-2:xpix+2])
         return xpix,ypix,ZMax,0.0001
     if (w2 < xpix < sizex-w2) and (w2 < ypix < sizey-w2) and image[ypix,xpix]:
@@ -1030 +1030 @@
             ringint = np.array([float(Image[int(x*scalex),int(y*scaley)]) for y,x in np.array(ringxy)[:,:2]])
             ringint /= np.mean(ringint)
-            print ' %s %.3f %s %.3f'%('d-spacing',ring['Dcalc'],'var(MRD):',np.var(ringint))
+            print ' %s %.3f %s %.3f'%('d-spacing',ring['Dcalc'],'sig(MRD):',np.sqrt(np.var(ringint)))
             RingsAI.append(np.array(zip(ringazm,ringint)).T)
-#            GSASIIpath.IPyBreak()
     return RingsAI
     
@@ -1056 +1055 @@
         else:                       #compression
             ring['Dcalc'] = dmin+3.*(dmax-dmin)/4.
-#        ring['Dcalc'] = np.mean(ring['ImtaCalc'][0])
 
 def calcFij(omg,phi,azm,th):

trunk/GSASIIimgGUI.py

@@ -1922 +1922 @@
             names=Names,lines=True)
         
+    def OnSaveStrRing(event):
+        Controls = G2frame.PatternTree.GetItemPyData(
+            G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'))
+        RingInt = G2img.IntStrSta(G2frame.ImageZ,data,Controls)
+        Names = ['d=%.3f'%(ring['Dcalc']) for ring in data['d-zero']]
+        pth = G2G.GetExportPath(G2frame)
+        dlg = wx.FileDialog(G2frame, 'Choose strain ring intensity file', pth, '', 
+            'ring intensity file (*.txt)|*.txt',wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
+        try:
+            if dlg.ShowModal() == wx.ID_OK:
+                filename = dlg.GetPath()
+                File = open(filename,'w')
+                for i,name in enumerate(Names):
+                    File.write('%s%s\n'%(' Ring intensity for ',name))
+                    File.write('%12s %12s\n'%('Azimuth','RMD'))
+                    for item in RingInt[i].T:
+                        File.write(' %12.3f %12.3f\n'%(item[0],item[1]))
+                    File.write('\n')
+                File.close()
+        finally:
+            dlg.Destroy()
+                
+                
     def OnFitStrSta(event):
         Controls = G2frame.PatternTree.GetItemPyData(
@@ -2129 +2152 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnUpdateDzero, id=G2gd.wxID_UPDATEDZERO)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnFitStrSta, id=G2gd.wxID_STRSTAFIT)
-    G2frame.dataFrame.Bind(wx.EVT_MENU, OnPlotStrSta, id=G2gd.wxID_STRSTAPLOT)
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnPlotStrSta, id=G2gd.wxID_STRSTAPLOT)  
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnSaveStrRing, id=G2gd.wxID_STRRINGSAVE)  
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnFitAllStrSta, id=G2gd.wxID_STRSTAALLFIT)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnCopyStrSta, id=G2gd.wxID_STRSTACOPY)