Changeset 406 for trunk/GSASII.py

Timestamp:

Nov 2, 2011 1:11:04 PM (12 years ago)

Author:

vondreele

Message:

implement background subtraction during image integration
implement copy for instrument parms & background
continue constraint GUI development
make sure proper updates in refinement/seq refinement

File:

• trunk/GSASII.py (modified) (4 diffs)

trunk/GSASII.py

@@ -502 +502 @@
                             Data['fullIntegrate'] = False
                             Data['setRings'] = False
+                            Data['background image'] = ['',1.0]                            
                         Data['setDefault'] = False
                         Data['range'] = [(Imin,Imax),[Imin,Imax]]
@@ -564 +565 @@
         if not G2gd.GetPatternTreeItemId(self,self.root,'Constraints'):
             sub = self.PatternTree.AppendItem(parent=self.root,text='Constraints')
-            self.PatternTree.SetItemPyData(sub,{})
+            self.PatternTree.SetItemPyData(sub,{'Hist':[],'HAP':[],'Phase':[]})
         if not G2gd.GetPatternTreeItemId(self,self.root,'Restraints'):
             sub = self.PatternTree.AppendItem(parent=self.root,text='Restraints')
@@ -643 +644 @@
                 dataGridSizer.Add(scale,0,wx.LEFT,10)
                 dataGridSizer.Add(name,0,wx.RIGHT,10)
-            dataGridSizer.Add(wx.StaticText(panel,-1,'Sum result name: '+dataType),0, \
-                wx.LEFT|wx.TOP|wx.ALIGN_CENTER_VERTICAL,10)
-            self.name = wx.TextCtrl(panel,-1,self.data[-1],size=wx.Size(200,20),style=wx.TE_PROCESS_ENTER)
-            self.name.Bind(wx.EVT_TEXT_ENTER,self.OnNameChange)
-            self.name.Bind(wx.EVT_KILL_FOCUS,self.OnNameChange)
-            dataGridSizer.Add(self.name,0,wx.RIGHT|wx.TOP,10)
+            if dataType:
+                dataGridSizer.Add(wx.StaticText(panel,-1,'Sum result name: '+dataType),0, \
+                    wx.LEFT|wx.TOP|wx.ALIGN_CENTER_VERTICAL,10)
+                self.name = wx.TextCtrl(panel,-1,self.data[-1],size=wx.Size(200,20),style=wx.TE_PROCESS_ENTER)
+                self.name.Bind(wx.EVT_TEXT_ENTER,self.OnNameChange)
+                self.name.Bind(wx.EVT_KILL_FOCUS,self.OnNameChange)
+                dataGridSizer.Add(self.name,0,wx.RIGHT|wx.TOP,10)
             mainSizer.Add(dataGridSizer,0,wx.EXPAND)
             OkBtn = wx.Button(panel,-1,"Ok")
@@ -1533 +1535 @@
 
     def OnSeqRefine(self,event):
-        self.OnFileSave(event)
         Id = G2gd.GetPatternTreeItemId(self,self.root,'Sequental results')
-        print Id
         if not Id:
             Id = self.PatternTree.AppendItem(self.root,text='Sequental results')
-            print Id
             self.PatternTree.SetItemPyData(Id,{})            
+        self.OnFileSave(event)
         dlg = wx.ProgressDialog('Residual for histogram 0','Powder profile Rwp =',101.0, 
             style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_CAN_ABORT)