Changeset 1056


Ignore:
Timestamp:
Sep 17, 2013 2:45:04 PM (8 years ago)
Author:
vondreele
Message:

restore multiprocessing MCSA

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r1047 r1056  
    18811881        self.GeneralCalc.Append(help='Run Monte Carlo - Simulated Annealing',id=wxID_SINGLEMCSA, kind=wx.ITEM_NORMAL,
    18821882            text='MC/SA')
    1883 #        self.GeneralCalc.Append(help='Run Monte Carlo - Simulated Annealing on multiprocessors',id=wxID_MULTIMCSA, kind=wx.ITEM_NORMAL,
    1884 #            text='Multi MC/SA')            #currently not useful
     1883        self.GeneralCalc.Append(help='Run Monte Carlo - Simulated Annealing on multiprocessors',id=wxID_MULTIMCSA, kind=wx.ITEM_NORMAL,
     1884            text='Multi MC/SA')            #currently not useful
    18851885        self.PostfillDataMenu()
    18861886       
  • trunk/GSASIImath.py

    r1055 r1056  
    21792179        self.T = self.T0*self.slope**self.k
    21802180       
    2181 class Tremayne_sa(base_schedule):   #needs fixing for two steps
    2182 
    2183     def init(self,**options):
    2184         self.__dict__.update(options)
    2185 
    2186 #    def update_guess(self,x0):
    2187 #        x0 = np.asarray(x0)
    2188 #        u = np.squeeze(np.random.uniform(0.,1.,size=self.dims))
    2189 #        xnew = x0+u
    2190 #        return xnew       
    2191    
    2192     def update_temp(self):
    2193         self.k += 1
    2194         self.T = self.T0*self.slope**k
    2195    
    21962181class _state(object):
    21972182    def __init__(self):
  • trunk/GSASIIphsGUI.py

    r1055 r1056  
    752752            line3Sizer = wx.BoxSizer(wx.HORIZONTAL)
    753753            Achoice = ['log','fast']                #these work
    754 #            Achoice = ['log','fast','cauchy','boltzmann','Tremayne']
     754#            Achoice = ['log','fast','cauchy','boltzmann']
    755755            line3Sizer.Add(wx.StaticText(General,label=' MC/SA schedule: '),0,wx.ALIGN_CENTER_VERTICAL)
    756756            Alist = wx.ComboBox(General,-1,value=MCSAdata['Algorithm'],choices=Achoice,
     
    758758            Alist.Bind(wx.EVT_COMBOBOX,OnAlist)
    759759            line3Sizer.Add(Alist,0,wx.ALIGN_CENTER_VERTICAL)
    760             if MCSAdata['Algorithm'] in ['Tremayne','fast','boltzmann','cauchy']:
     760            if MCSAdata['Algorithm'] in ['fast','boltzmann','cauchy']:
    761761                Names = [' A-jump: ',' B-jump: ']
    762762                parms = 'Jump coeff'
     
    40524052                Obj = event.GetEventObject()
    40534053                model,ix,ObjA,ObjV = Indx[Obj.GetId()]
    4054                 A,V = G2mth.Q2AVdeg(model['Ori'][0])
     4054                A = model['Ori'][0][0]
     4055                V = model['Ori'][0][1:]
    40554056                if ix:
    40564057                    Anew = A
     
    40664067                    except ValueError:
    40674068                        Anew = A
    4068                 model['Ori'][0] = G2mth.AVdeg2Q(Anew,Vnew)
    4069                 A,V = G2mth.Q2AVdeg(model['Ori'][0])
     4069                Q = G2mth.AVdeg2Q(Anew,Vnew)
     4070                A,V = G2mth.Q2AVdeg(Q)
     4071                model['Ori'][0][0] = A
     4072                model['Ori'][0][1:] = V
    40704073                if ix:
    40714074                    ObjV.SetValue('%.3f %.3f %.3f'%(V[0],V[1],V[2]))
     
    50025005            G2frame.dataFrame.Bind(wx.EVT_MENU, OnFourClear, id=G2gd.wxID_FOURCLEAR)
    50035006            G2frame.dataFrame.Bind(wx.EVT_MENU, OnRunSingleMCSA, id=G2gd.wxID_SINGLEMCSA)
     5007            G2frame.dataFrame.Bind(wx.EVT_MENU, OnRunMultiMCSA, id=G2gd.wxID_MULTIMCSA)
    50045008            UpdateGeneral()
    50055009        elif text == 'Data':
Note: See TracChangeset for help on using the changeset viewer.