Changeset 411 for trunk/GSASII.py


Ignore:
Timestamp:
Nov 11, 2011 2:14:35 PM (11 years ago)
Author:
vondreele
Message:

fix very old (!) bug in psvfcj.for
implement neutron scattering lengths in GSASII including the dozen anomalous scattering isotopes
isotope choice is in General
so GSASII will now do neutron CW Rietveld refinements
some cleanup of the constraints GUI
remove varyList from GSASIImapvars.py globals

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r406 r411  
    639639                name = wx.TextCtrl(panel,-1,item[1],size=wx.Size(200,20))
    640640                name.SetEditable(False)
    641                 scale = wx.TextCtrl(panel,id,str(item[0]),style=wx.TE_PROCESS_ENTER)
     641                scale = wx.TextCtrl(panel,id,'%.3f'%(item[0]),style=wx.TE_PROCESS_ENTER)
    642642                scale.Bind(wx.EVT_TEXT_ENTER,self.OnScaleChange)
    643643                scale.Bind(wx.EVT_KILL_FOCUS,self.OnScaleChange)
     
    680680                if value and '-' not in value[0]:
    681681                    print 'bad input - numbers only'
    682                     self.FindWindowById(id).SetValue('0.0')
     682                    self.FindWindowById(id).SetValue('0.000')
    683683           
    684684        def OnOk(self,event):
     
    14791479        parmDict = {}
    14801480        Histograms,Phases = self.GetUsedHistogramsAndPhasesfromTree()
    1481         Natoms,phaseVary,phaseDict,pawleyLookup,FFtable = G2str.GetPhaseData(Phases,Print=False)       
     1481        Natoms,phaseVary,phaseDict,pawleyLookup,FFtable,BLtable = G2str.GetPhaseData(Phases,Print=False)       
    14821482        hapVary,hapDict,controlDict = G2str.GetHistogramPhaseData(Phases,Histograms,Print=False)
    14831483        histVary,histDict,controlDict = G2str.GetHistogramData(Histograms,Print=False)
Note: See TracChangeset for help on using the changeset viewer.