Changeset 380 for trunk/GSASII.py


Ignore:
Timestamp:
Oct 3, 2011 3:43:49 PM (11 years ago)
Author:
vondreele
Message:

completed Rietveld refinement version

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r373 r380  
    14531453        parmDict = {}
    14541454        Histograms,Phases = self.GetUsedHistogramsAndPhasesfromTree()
    1455         phaseVary,phaseDict,pawleyLookup = G2str.GetPhaseData(Phases,Print=False)       
     1455        Natoms,phaseVary,phaseDict,pawleyLookup,FFtable = G2str.GetPhaseData(Phases,Print=False)       
    14561456        hapVary,hapDict,controlDict = G2str.GetHistogramPhaseData(Phases,Histograms,Print=False)
    14571457        histVary,histDict,controlDict = G2str.GetHistogramData(Histograms,Print=False)
     
    14631463            if parm.split(':')[-1] in ['Azimuth','Gonio. radius','Lam1','Lam2']:
    14641464                parmDict[parm] = [parmDict[parm],' ']
     1465            elif parm.split(':')[-2] in ['Ax','Ay','Az']:
     1466                parmDict[parm] = [parmDict[parm],' ']
    14651467            elif parm in varyList:
    14661468                parmDict[parm] = [parmDict[parm],'True']
     
    14701472        try:
    14711473            if dlg.ShowModal() == wx.ID_OK:
    1472                 print 'do something with changes??'
    1473         finally:
    1474             dlg.Destroy()
    1475 
    1476 
     1474                print 'do something with changes?? - No!'
     1475        finally:
     1476            dlg.Destroy()
    14771477       
    14781478    def OnRefine(self,event):
     
    14801480        #works - but it'd be better if it could restore plots
    14811481        dlg = wx.ProgressDialog('Residual','Powder profile Rwp =',101.0,
    1482             style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_REMAINING_TIME|wx.PD_CAN_ABORT)
     1482            style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_CAN_ABORT)
    14831483        screenSize = wx.ClientDisplayRect()
    14841484        Size = dlg.GetSize()
Note: See TracChangeset for help on using the changeset viewer.