Changeset 5292

Timestamp:

May 27, 2022 2:10:54 PM (9 months ago)

Author:

toby

Message:

fix bug in plotting peak list

Location:

trunk

Files:

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

trunk/GSASIIplot.py

@@ -3720 +3720 @@
                         tip = 'On data point: Pick peak - L or R MB. On line: L-move, R-delete'
                         Page.SetToolTipString(tip)
-                        data = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Peak List'))
+                        peaks = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Peak List'))
                         selectedPeaks = list(set(
                             [row for row,col in G2frame.reflGrid.GetSelectedCells()] +
                             G2frame.reflGrid.GetSelectedRows()))
                         G2frame.dataWindow.movePeak.Enable(len(selectedPeaks) == 1) # allow peak move from table when one peak is selected
-                        for i,item in enumerate(data['peaks']):
+                        for i,item in enumerate(peaks['peaks']):
                             if type(item) is dict: continue
                             if i in selectedPeaks:
@@ -3734 +3734 @@
                             if Ni == N+1:
                                 Lines[-1].set_lw(Lines[-1].get_lw()+1)
-                        data['LaueFringe'] = data.get('LaueFringe',{})
-                        for pos in data['LaueFringe'].get('satellites',[]):
+                        peaks['LaueFringe'] = peaks.get('LaueFringe',{})
+                        for pos in peaks['LaueFringe'].get('satellites',[]):
                             plotVline(Page,Plot,Lines,Parms,pos,'k',False)
                     if G2frame.GPXtree.GetItemText(PickId) == 'Limits':
                         tip = 'On data point: Lower limit - L MB; Upper limit - R MB. On limit: MB down to move'
                         Page.SetToolTipString(tip)
-                        data = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Limits'))
+                        limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Limits'))  # used anywhere?
                         
             else:   #not picked

trunk/GSASIIpwd.py

@@ -1452 +1452 @@
                     break
                 #LF.plotme(fmin,lam,pos,intens,sig,gam,shol,ncells,clat,damp,asym)
-                LaueFringePeakCalc(xdata,yc,lam,pos,intens,sig,gam,shol,ncells,clat,damp,asym,fmin)
+                #LaueFringePeakCalc(xdata,yc,lam,pos,intens,sig,gam,shol,ncells,clat,damp,asym,fmin,plot=(iPeak==0))
+                LaueFringePeakCalc(xdata,yc,lam,pos,intens,sig,gam,shol,ncells,clat,damp,asym,fmin,plot=False)
                 if Ka2:
                     pos2 = pos+lamRatio*tand(pos/2.0)       # + 360/pi * Dlam/lam * tan(th)