Changeset 698

Timestamp:

Aug 3, 2012 3:50:30 PM (10 years ago)

Author:

vondreele

Message:

implement Pawley update from reflection list
a bit more for stress/atrain

Location:

trunk

Files:

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

trunk/GSASIIgrid.py

@@ -61 +61 @@
 ] = [wx.NewId() for item in range(2)]
 
-[ wxID_PAWLEYLOAD, wxID_PAWLEYIMPORT, wxID_PAWLEYDELETE, wxID_PAWLEYESTIMATE,
+[ wxID_PAWLEYLOAD, wxID_PAWLEYDELETE, wxID_PAWLEYESTIMATE,
+    wxID_PAWLEYUPDATE,
 ] = [wx.NewId() for item in range(4)]
 
@@ -596 +597 @@
         self.PawleyEdit.Append(id=wxID_PAWLEYESTIMATE, kind=wx.ITEM_NORMAL,text='Pawley estimate',
             help='Estimate initial Pawley intensities')
+        self.PawleyEdit.Append(id=wxID_PAWLEYUPDATE, kind=wx.ITEM_NORMAL,text='Pawley update',
+            help='Update Pawley intensities from reflection list')
         self.PawleyEdit.Append(id=wxID_PAWLEYDELETE, kind=wx.ITEM_NORMAL,text='Pawley delete',
             help='Delete Pawley reflection list')

trunk/GSASIIimage.py

@@ -743 +743 @@
     print "Elapsed time:","%8.3f"%(t1-t0), "s"
     return H0,H1,H2
+    
+def FitStrSta(Image,StrSta,Controls,Masks):
+    
+    print Image.shape
+    print StrSta
+    print Controls
+    print Masks

trunk/GSASIIimgGUI.py

@@ -1150 +1150 @@
 
     def OnFitStrSta(event):
-        print 'Fit stress/strain data - does nothing yet'
-        event.Skip()
+        Masks = G2frame.PatternTree.GetItemPyData(
+            G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Masks'))
+        Controls = G2frame.PatternTree.GetItemPyData(
+            G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'))
+        G2img.FitStrSta(G2frame.ImageZ,data,Controls,Masks)
         
     def SamSizer():

trunk/GSASIIphsGUI.py

@@ -3748 +3748 @@
                 pass
         FillPawleyReflectionsGrid()
+
+    def OnPawleyUpdate(event):
+        try:
+            Refs = data['Pawley ref']
+            Histograms = data['Histograms']
+        except KeyError:
+            print '**** Error - no histograms defined for this phase ****'
+            return
+        HistoNames = Histograms.keys()
+        PatternId = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,HistoNames[0])
+        refData = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists'))[PhaseName]
+        for iref,ref in enumerate(Refs):
+            try:
+                ref[6] = refData[iref][9]
+                ref[7] = 1.0
+            except IndexError:
+                pass
+        FillPawleyReflectionsGrid()
                             
     def OnPawleyDelete(event):
@@ -4035 +4053 @@
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyLoad, id=G2gd.wxID_PAWLEYLOAD)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyEstimate, id=G2gd.wxID_PAWLEYESTIMATE)
+            G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyUpdate, id=G2gd.wxID_PAWLEYUPDATE)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyDelete, id=G2gd.wxID_PAWLEYDELETE)            
             FillPawleyReflectionsGrid()