Changeset 1189

Timestamp:

Jan 10, 2014 9:29:52 AM (9 years ago)

Author:

vondreele

Message:

change ring search defaults for stress/strainCalc
implement a fit all images for stress strain
image fit is on delta-d (was delta d²⁾

Location:

trunk

Files:

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

trunk/GSASIIgrid.py

@@ -97 +97 @@
 
 [ wxID_MASKCOPY, wxID_MASKSAVE, wxID_MASKLOAD,wxID_NEWMASKSPOT,wxID_NEWMASKARC,wxID_NEWMASKRING,
-  wxID_NEWMASKFRAME, wxID_NEWMASKPOLY,
+    wxID_NEWMASKFRAME, wxID_NEWMASKPOLY,
 ] = [wx.NewId() for item in range(8)]
 
-
 [ wxID_STRSTACOPY, wxID_STRSTAFIT, wxID_STRSTASAVE, wxID_STRSTALOAD,wxID_APPENDDZERO,
-] = [wx.NewId() for item in range(5)]
+    wxID_STRSTAALLFIT,
+] = [wx.NewId() for item in range(6)]
 
 [ wxID_BACKCOPY,wxID_LIMITCOPY,wxID_SAMPLECOPY, wxID_BACKFLAGCOPY, wxID_SAMPLEFLAGCOPY,
@@ -2424 +2424 @@
         self.StrStaEdit.Append(help='Fit stress/strain data', 
             id=wxID_STRSTAFIT, kind=wx.ITEM_NORMAL,text='Fit stress/strain')
+        self.StrStaEdit.Append(help='Fit stress/strain data for all images', 
+            id=wxID_STRSTAALLFIT, kind=wx.ITEM_NORMAL,text='All image fit')
         self.StrStaEdit.Append(help='Copy stress/strain data to other images', 
             id=wxID_STRSTACOPY, kind=wx.ITEM_NORMAL,text='Copy stress/strain')

trunk/GSASIIimage.py

@@ -952 +952 @@
         V = 1.+np.sum(np.sum(E*calcFij(90.,phi,azm,th).T/1.e6,axis=2),axis=1)
         dspc = dset*V
-        return dspo**2-dspc**2
+        return dspo-dspc
         
     names = ['e11','e12','e22']

trunk/GSASIIimgGUI.py

@@ -1322 +1322 @@
     
     def OnAppendDzero(event):
-        data['d-zero'].append({'Dset':1.0,'Dcalc':0.0,'pixLimit':10,'cutoff':10.0,
+        data['d-zero'].append({'Dset':1.0,'Dcalc':0.0,'pixLimit':10,'cutoff':1.0,
             'ImxyObs':[[],[]],'ImtaObs':[[],[]],'ImtaCalc':[[],[]],'Emat':[1.0,1.0,1.0]})
         UpdateStressStrain(G2frame,data)
@@ -1392 +1392 @@
 
     def OnFitStrSta(event):
-        Masks = G2frame.PatternTree.GetItemPyData(
-            G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Masks'))
         Controls = G2frame.PatternTree.GetItemPyData(
             G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'))
@@ -1401 +1399 @@
         G2plt.PlotExposedImage(G2frame,event=event)
         G2plt.PlotStrain(G2frame,data,newPlot=False)
+        
+    def OnAllFitStrSta(event):
+        TextList = [[False,'All IMG',0]]
+        Names = []
+        if G2frame.PatternTree.GetCount():
+            id, cookie = G2frame.PatternTree.GetFirstChild(G2frame.root)
+            while id:
+                name = G2frame.PatternTree.GetItemText(id)
+                Names.append(name)
+                if 'IMG' in name:
+                    TextList.append([False,name,id])
+                id, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)
+            if len(TextList) == 1:
+                G2frame.ErrorDialog('Nothing to fit','There must some "IMG" patterns')
+                return
+            dlg = G2frame.CopyDialog(G2frame,'Stress/Strain fitting','Select images to fit:',TextList)
+            try:
+                if dlg.ShowModal() == wx.ID_OK:
+                    result = dlg.GetData()
+                    if result[0][0]:                    #the 'All IMG' is True
+                        result = TextList[1:]
+                        for item in result: item[0] = True
+                    for item in result:
+                        ifFit,name,id = item
+                        if ifFit:
+                            Controls = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,id, 'Image Controls'))
+                            StaCtrls = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,id, 'Stress/Strain'))
+                            id = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, name)
+                            Npix,imagefile = G2frame.PatternTree.GetItemPyData(id)
+                            image = G2IO.GetImageData(G2frame,imagefile,True)
+                            G2img.FitStrSta(image,StaCtrls,Controls)
+                            G2plt.PlotStrain(G2frame,StaCtrls,newPlot=True)
+            finally:
+                dlg.Destroy()
+            print 'All images fitted'
         
     def SamSizer():
@@ -1479 +1512 @@
                 value = min(10.0,max(0.5,float(Obj.GetValue())))
             except ValueError:
-                value = 10.0
+                value = 1.0
             Obj.SetValue("%.1f"%(value))
             data['d-zero'][Indx[Obj.GetId()]]['cutoff'] = value 
@@ -1546 +1579 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnAppendDzero, id=G2gd.wxID_APPENDDZERO)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnFitStrSta, id=G2gd.wxID_STRSTAFIT)
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnAllFitStrSta, id=G2gd.wxID_STRSTAALLFIT)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnCopyStrSta, id=G2gd.wxID_STRSTACOPY)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnLoadStrSta, id=G2gd.wxID_STRSTALOAD)

trunk/GSASIIplot.py

@@ -2387 +2387 @@
                 return
             dsp = G2img.GetDsp(Xpos,Ypos,Data)
-            StrSta['d-zero'].append({'Dset':dsp,'Dcalc':0.0,'pixLimit':10,'cutoff':10.0,
+            StrSta['d-zero'].append({'Dset':dsp,'Dcalc':0.0,'pixLimit':10,'cutoff':1.0,
                 'ImxyObs':[[],[]],'ImtaObs':[[],[]],'ImtaCalc':[[],[]],'Emat':[1.0,1.0,1.0]})
             R,r = G2img.MakeStrStaRing(StrSta['d-zero'][-1],G2frame.ImageZ,Data)