Changeset 1451 for trunk/GSASIIplot.py

Timestamp:

Aug 1, 2014 11:15:20 AM (9 years ago)

Author:

toby

Message:

Cleanup Instrument Parms bug due to reformat of peak list

File:

• trunk/GSASIIplot.py (modified) (1 diff)

trunk/GSASIIplot.py

@@ -2160 +2160 @@
     else:
         difC = Parms['difC'][0]
-    peaks = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Peak List'))['peaks']
-    
+    try:  # PATCH: deal with older peak lists, before changed to dict to implement TOF
+        peaks = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Peak List'))['peaks']
+    except TypeError:
+        print "Your peak list needs reformatting...",
+        item = G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Peak List')
+        G2frame.PatternTree.SelectItem(item)  
+        item = G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Instrument Parameters')
+        G2frame.PatternTree.SelectItem(item)
+        print "done"
+        return
     try:
         plotNum = G2frame.G2plotNB.plotList.index('Peak Widths')