Changeset 1042 for trunk/GSASII.py

Timestamp:

Aug 25, 2013 9:08:52 AM (9 years ago)

Author:

vondreele

Message:

fixed HKLF data bug

File:

• trunk/GSASII.py (modified) (2 diffs)

trunk/GSASII.py

@@ -2292 +2292 @@
         '''
         HKLFdata = {}
-        try:
-            HKLFdata.update(self.PatternTree.GetItemPyData(HKLFname)[0])            #wtFactor + ?
-        except ValueError:
-            HKLFdata['wtFactor'] = 1.0
+        HKLFdata.update(self.PatternTree.GetItemPyData(HKLFname)[0])            #wtFactor + ?
+#        try:
+#            HKLFdata.update(self.PatternTree.GetItemPyData(HKLFname)[0])            #wtFactor + ?
+#        except ValueError:
+#            HKLFdata['wtFactor'] = 1.0
         HKLFdata['Data'] = self.PatternTree.GetItemPyData(HKLFname)[1]
         HKLFdata['Instrument Parameters'] = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,HKLFname,'Instrument Parameters'))
@@ -2377 +2378 @@
         parmDict = {}
         Histograms,Phases = self.GetUsedHistogramsAndPhasesfromTree()
+        for phase in Phases:
+            if 'pId' not in Phases[phase]:
+                self.ErrorDialog('View parameter error','You must run least squares at least once')
+                return
         rigidbodyDict = self.PatternTree.GetItemPyData(   
             G2gd.GetPatternTreeItemId(self,self.root,'Rigid bodies'))