Changeset 362 for trunk/GSASIIgrid.py

Timestamp:

Sep 4, 2011 8:04:31 AM (11 years ago)

Author:

vondreele

Message:

add shift factor to LS controls

File:

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

trunk/GSASIIgrid.py

@@ -508 +508 @@
 def UpdateControls(self,data):
     #patch
+    if 'shift factor' not in data:
+        data['shift factor'] = 1.        
     if 'deriv type' not in data:
         data['deriv type'] = 'analytical'
         data['min dM/M'] = 0.0001
+        data['shift factor'] = 1.
     #end patch
     '''
@@ -524 +527 @@
         
     def OnConvergence(event):
+        Obj = event.GetObject()
         try:
-            value = max(1.e-9,min(1.0,float(Cnvrg.GetValue())))
+            value = max(1.e-9,min(1.0,float(Obj.GetValue())))
         except ValueError:
             value = 0.0001
         data['min dM/M'] = value
-        Cnvrg.SetValue('%.2g'%(value))
+        Obj.SetValue('%.2g'%(value))
         
     def OnDerivType(event):
-        data['deriv type'] = derivSel.GetValue()
+        Obj = event.GetObject()
+        data['deriv type'] = Obj.GetValue()
         derivSel.SetValue(data['deriv type'])
+        
+    def OnFactor(event):
+        Obj = event.GetObject()
+        try:
+            value = min(max(float(Obj.GetValue()),0.001),100.)
+        except ValueError:
+            value = 1.0
+        data['shift factor'] = value
+        Obj.SetValue('%.3f'%(value))
         
     if self.dataDisplay:
@@ -546 +560 @@
     mainSizer.Add((5,5),0)
     mainSizer.Add(wx.StaticText(self.dataDisplay,label=' Refinement Controls:'),0,wx.ALIGN_CENTER_VERTICAL)
-    LSSizer = wx.FlexGridSizer(cols=4,vgap=5,hgap=5)
+    LSSizer = wx.FlexGridSizer(cols=6,vgap=5,hgap=5)
     LSSizer.Add(wx.StaticText(self.dataDisplay,label='Refinement derivatives: '),0,wx.ALIGN_CENTER_VERTICAL)
     Choice=['analytic','numeric']
@@ -559 +573 @@
     Cnvrg.Bind(wx.EVT_KILL_FOCUS,OnConvergence)
     LSSizer.Add(Cnvrg,0,wx.ALIGN_CENTER_VERTICAL)
-    
-    
+    LSSizer.Add(wx.StaticText(self.dataDisplay,label=' Initial shift factor: '),0,wx.ALIGN_CENTER_VERTICAL)
+    Factr = wx.TextCtrl(self.dataDisplay,-1,value='%.3f'%(data['shift factor']),style=wx.TE_PROCESS_ENTER)
+    Factr.Bind(wx.EVT_TEXT_ENTER,OnFactor)
+    Factr.Bind(wx.EVT_KILL_FOCUS,OnFactor)
+    LSSizer.Add(Factr,0,wx.ALIGN_CENTER_VERTICAL)
+        
     mainSizer.Add(LSSizer)
     mainSizer.Add((5,5),0)