Changeset 1042 for trunk/GSASII.py


Ignore:
Timestamp:
Aug 25, 2013 9:08:52 AM (9 years ago)
Author:
vondreele
Message:

fixed HKLF data bug

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1035 r1042  
    22922292        '''
    22932293        HKLFdata = {}
    2294         try:
    2295             HKLFdata.update(self.PatternTree.GetItemPyData(HKLFname)[0])            #wtFactor + ?
    2296         except ValueError:
    2297             HKLFdata['wtFactor'] = 1.0
     2294        HKLFdata.update(self.PatternTree.GetItemPyData(HKLFname)[0])            #wtFactor + ?
     2295#        try:
     2296#            HKLFdata.update(self.PatternTree.GetItemPyData(HKLFname)[0])            #wtFactor + ?
     2297#        except ValueError:
     2298#            HKLFdata['wtFactor'] = 1.0
    22982299        HKLFdata['Data'] = self.PatternTree.GetItemPyData(HKLFname)[1]
    22992300        HKLFdata['Instrument Parameters'] = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,HKLFname,'Instrument Parameters'))
     
    23772378        parmDict = {}
    23782379        Histograms,Phases = self.GetUsedHistogramsAndPhasesfromTree()
     2380        for phase in Phases:
     2381            if 'pId' not in Phases[phase]:
     2382                self.ErrorDialog('View parameter error','You must run least squares at least once')
     2383                return
    23792384        rigidbodyDict = self.PatternTree.GetItemPyData(   
    23802385            G2gd.GetPatternTreeItemId(self,self.root,'Rigid bodies'))
Note: See TracChangeset for help on using the changeset viewer.