Changeset 1609

Timestamp:

Dec 16, 2014 5:31:47 PM (8 years ago)

Author:

toby

Message:

more work on phase rename: reflection lists

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (2 diffs)
• GSASIIplot.py (modified) (1 diff)

trunk/GSASIIphsGUI.py

@@ -208 +208 @@
             'Cell':[False,10.,10.,10.,90.,90.,90,1000.]
             'AtomPtrs':[]
-            'Histogram list':['',]
             'Pawley dmin':1.0,
             'Pawley neg wt':0.0}
@@ -250 +249 @@
                     G2frame.dataFrame.SetLabel('Phase Data for '+generalData['Name'])
                     G2frame.PatternTree.SetItemText(Item,generalData['Name'])
-                    #Hmm, need to change phase name key in Reflection Lists for each histogram
+                    # change phase name key in Reflection Lists for each histogram
+                    for hist in data['Histograms']:
+                        ht = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,hist)
+                        rt = G2gd.GetPatternTreeItemId(G2frame,ht,'Reflection Lists')
+                        if not rt: continue
+                        RfList = G2frame.PatternTree.GetItemPyData(rt)
+                        if oldName not in RfList:
+                            print('Warning: '+oldName+' not in Reflection List for '+
+                                  hist)
+                            continue
+                        RfList[newName] = RfList[oldName]
+                        del RfList[oldName]                            
                 NameTxt.SetValue(generalData['Name'])
                                                 

trunk/GSASIIplot.py

@@ -1647 +1647 @@
         if G2frame.PatternTree.GetItemText(PickId) in ['Index Peak List','Unit Cells List']:
             peaks = np.array((G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Index Peak List'))))
+            if not peaks: return # are there any peaks?
             for peak in peaks[0]:
                 if peak[2]: