Changeset 1056

Timestamp:

Sep 17, 2013 2:45:04 PM (10 years ago)

Author:

vondreele

Message:

restore multiprocessing MCSA

Location:

trunk

Files:

• GSASIIgrid.py (modified) (1 diff)
• GSASIImath.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (5 diffs)

trunk/GSASIIgrid.py

@@ -1881 +1881 @@
         self.GeneralCalc.Append(help='Run Monte Carlo - Simulated Annealing',id=wxID_SINGLEMCSA, kind=wx.ITEM_NORMAL,
             text='MC/SA')
-#        self.GeneralCalc.Append(help='Run Monte Carlo - Simulated Annealing on multiprocessors',id=wxID_MULTIMCSA, kind=wx.ITEM_NORMAL,
-#            text='Multi MC/SA')            #currently not useful
+        self.GeneralCalc.Append(help='Run Monte Carlo - Simulated Annealing on multiprocessors',id=wxID_MULTIMCSA, kind=wx.ITEM_NORMAL,
+            text='Multi MC/SA')            #currently not useful
         self.PostfillDataMenu()
         

trunk/GSASIImath.py

@@ -2179 +2179 @@
         self.T = self.T0*self.slope**self.k
         
-class Tremayne_sa(base_schedule):   #needs fixing for two steps
-
-    def init(self,**options):
-        self.__dict__.update(options)
-
-#    def update_guess(self,x0):
-#        x0 = np.asarray(x0)
-#        u = np.squeeze(np.random.uniform(0.,1.,size=self.dims))
-#        xnew = x0+u
-#        return xnew        
-    
-    def update_temp(self):
-        self.k += 1
-        self.T = self.T0*self.slope**k
-    
 class _state(object):
     def __init__(self):

trunk/GSASIIphsGUI.py

@@ -752 +752 @@
             line3Sizer = wx.BoxSizer(wx.HORIZONTAL)
             Achoice = ['log','fast']                #these work
-#            Achoice = ['log','fast','cauchy','boltzmann','Tremayne']
+#            Achoice = ['log','fast','cauchy','boltzmann']
             line3Sizer.Add(wx.StaticText(General,label=' MC/SA schedule: '),0,wx.ALIGN_CENTER_VERTICAL)
             Alist = wx.ComboBox(General,-1,value=MCSAdata['Algorithm'],choices=Achoice,
@@ -758 +758 @@
             Alist.Bind(wx.EVT_COMBOBOX,OnAlist)
             line3Sizer.Add(Alist,0,wx.ALIGN_CENTER_VERTICAL)
-            if MCSAdata['Algorithm'] in ['Tremayne','fast','boltzmann','cauchy']:
+            if MCSAdata['Algorithm'] in ['fast','boltzmann','cauchy']:
                 Names = [' A-jump: ',' B-jump: ']
                 parms = 'Jump coeff'
@@ -4052 +4052 @@
                 Obj = event.GetEventObject()
                 model,ix,ObjA,ObjV = Indx[Obj.GetId()]
-                A,V = G2mth.Q2AVdeg(model['Ori'][0])
+                A = model['Ori'][0][0]
+                V = model['Ori'][0][1:]
                 if ix:
                     Anew = A
@@ -4066 +4067 @@
                     except ValueError:
                         Anew = A
-                model['Ori'][0] = G2mth.AVdeg2Q(Anew,Vnew)
-                A,V = G2mth.Q2AVdeg(model['Ori'][0])
+                Q = G2mth.AVdeg2Q(Anew,Vnew)
+                A,V = G2mth.Q2AVdeg(Q)
+                model['Ori'][0][0] = A
+                model['Ori'][0][1:] = V
                 if ix:
                     ObjV.SetValue('%.3f %.3f %.3f'%(V[0],V[1],V[2]))
@@ -5002 +5005 @@
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnFourClear, id=G2gd.wxID_FOURCLEAR)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnRunSingleMCSA, id=G2gd.wxID_SINGLEMCSA)
+            G2frame.dataFrame.Bind(wx.EVT_MENU, OnRunMultiMCSA, id=G2gd.wxID_MULTIMCSA)
             UpdateGeneral()
         elif text == 'Data':