Changeset 312 for trunk/GSASIIpwdGUI.py


Ignore:
Timestamp:
Jun 27, 2011 12:11:26 PM (11 years ago)
Author:
vondreele
Message:

implement refinement of zero point as part of cell refinement

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r311 r312  
    792792        ibrav = bravaisSymb.index(controls[5])
    793793        dmin = G2indx.getDmin(peaks)-0.005
    794         Lhkl,M20,X20,Aref,Zero = G2indx.refinePeaks(peaks,ibrav,A,controls[:2])
    795         controls[:2] = Zero
     794        if controls[0]:
     795            Lhkl,M20,X20,Aref,Zero = G2indx.refinePeaksZ(peaks,inst[1],ibrav,A,controls[1])           
     796            controls[1] = Zero
     797        else:
     798            Lhkl,M20,X20,Aref = G2indx.refinePeaks(peaks,ibrav,A)
    796799        controls[6:12] = G2lat.A2cell(Aref)
    797800        controls[12] = G2lat.calc_V(Aref)
     
    9971000    zero.Bind(wx.EVT_KILL_FOCUS,OnZero)
    9981001    littleSizer.Add(zero,0,wx.ALIGN_CENTER_VERTICAL)
    999     zeroVar = wx.CheckBox(self.dataDisplay,label="Refine? (not implemented)")
     1002    zeroVar = wx.CheckBox(self.dataDisplay,label="Refine?")
     1003    zeroVar.SetValue(controls[0])
    10001004    zeroVar.Bind(wx.EVT_CHECKBOX,OnZeroVar)
    10011005    littleSizer.Add(zeroVar,0,wx.ALIGN_CENTER_VERTICAL)
Note: See TracChangeset for help on using the changeset viewer.