Changeset 496 for MPbranch/GSASIIgrid.py

Timestamp:

Feb 24, 2012 3:12:00 PM (11 years ago)

Author:

vondreele

Message:

making 1st multiprocess version of GSAS-II

Location:

MPbranch

Files:

• . (copied) (copied from trunk)
• GSASIIgrid.py (copied) (copied from trunk/GSASIIgrid.py) (4 diffs)

MPbranch/GSASIIgrid.py

@@ -743 +743 @@
         data['min dM/M'] = 0.0001
         data['shift factor'] = 1.
-        data['max cyc'] = 3        
+        data['max cyc'] = 3
+        data['max Hprocess'] = 1
+        data['max Rprocess'] = 1        
     if 'shift factor' not in data:
         data['shift factor'] = 1.
     if 'max cyc' not in data:
-        data['max cyc'] = 3        
+        data['max cyc'] = 3  
+    if 'max Hprocess' not in data:     
+        data['max Hprocess'] = 1
+        data['max Rprocess'] = 1        
     #end patch
     def SeqSizer():
@@ -805 +810 @@
             data['max cyc'] = int(maxCyc.GetValue())
             maxCyc.SetValue(str(data['max cyc']))
+
+        def OnMaxHproc(event):
+            if int(maxHproc.GetValue()) > 0:
+                data['max Hprocess'] = int(maxHproc.GetValue())
+
+        def OnMaxRproc(event):
+            if int(maxRproc.GetValue()) > 0:
+                data['max Rprocess'] = int(maxRproc.GetValue())
                         
         def OnFactor(event):
@@ -836 +849 @@
             maxCyc.Bind(wx.EVT_COMBOBOX, OnMaxCycles)
             LSSizer.Add(maxCyc,0,wx.ALIGN_CENTER_VERTICAL)
+            LSSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Max histogram proc: '),0,wx.ALIGN_CENTER_VERTICAL)
+            maxHproc = wx.TextCtrl(G2frame.dataDisplay,-1,value='%d'%(data['max Hprocess']),style=wx.TE_PROCESS_ENTER)
+            maxHproc.Bind(wx.EVT_TEXT_ENTER,OnMaxHproc)
+            maxHproc.Bind(wx.EVT_KILL_FOCUS,OnMaxHproc)
+            LSSizer.Add(maxHproc,0,wx.ALIGN_CENTER_VERTICAL)
+            LSSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Max reflection proc: '),0,wx.ALIGN_CENTER_VERTICAL)
+            maxRproc = wx.TextCtrl(G2frame.dataDisplay,-1,value='%d'%(data['max Rprocess']),style=wx.TE_PROCESS_ENTER)
+            maxRproc.Bind(wx.EVT_TEXT_ENTER,OnMaxRproc)
+            maxRproc.Bind(wx.EVT_KILL_FOCUS,OnMaxRproc)
+            LSSizer.Add(maxRproc,0,wx.ALIGN_CENTER_VERTICAL)
         else:
             LSSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Initial shift factor: '),0,wx.ALIGN_CENTER_VERTICAL)
@@ -860 +883 @@
     mainSizer.Add((5,5),0)
         
-    mainSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Density Map Controls:'),0,wx.ALIGN_CENTER_VERTICAL)
-
     mainSizer.Layout()    
     G2frame.dataDisplay.SetSizer(mainSizer)