Changeset 691

Timestamp:

Jul 19, 2012 12:36:51 PM (11 years ago)

Author:

vondreele

Message:

another wtFactor fix

File:

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

trunk/GSASII.py

@@ -1983 +1983 @@
         '''
         PWDRdata = {}
-        PWDRdata.update(self.PatternTree.GetItemPyData(PWDRname)[0])            #wtFactor + ?
+        try:
+            PWDRdata.update(self.PatternTree.GetItemPyData(PWDRname)[0])            #wtFactor + ?
+        except ValueError:
+            PWDRdata['wtFactor'] = 1.0
         PWDRdata['Data'] = self.PatternTree.GetItemPyData(PWDRname)[1]          #powder data arrays
         PWDRdata['Limits'] = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PWDRname,'Limits'))
@@ -2001 +2004 @@
         '''
         HKLFdata = {}
-        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'))