Changeset 1190

Timestamp:

Jan 10, 2014 11:50:41 AM (9 years ago)

Author:

vondreele

Message:

fix peak picking in q-plots

Location:

trunk

Files:

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

trunk/GSASIIimgGUI.py

@@ -1588 +1588 @@
         G2frame.dataFrame.GetStatusBar().SetStatusText('Add strain ring active - LB pick d-zero value')
     else:
-        G2frame.dataFrame.GetStatusBar().SetStatusText("To add strain data: On On 2D Powder Image, key a:add ring")
+        G2frame.dataFrame.GetStatusBar().SetStatusText("To add strain data: On 2D Powder Image, key a:add ring")
         
     G2frame.dataDisplay = wx.Panel(G2frame.dataFrame)

trunk/GSASIIplot.py

@@ -559 +559 @@
             if ind.all() != [0]:                                    #picked a data point
                 data = G2frame.PatternTree.GetItemPyData(G2frame.PickId)
-                XY = G2mth.setPeakparms(Parms,Parms2,xy[0],xy[1])           #what happens for a q-plot???
+                if 'C' in Parms['Type'][0]:                            #CW data - TOF later in an elif
+                    if G2frame.qPlot:                              #qplot - convert back to 2-theta
+                        xy[0] = 2.0*asind(xy[0]*wave/(4*math.pi))
+                XY = G2mth.setPeakparms(Parms,Parms2,xy[0],xy[1])
                 data.append(XY)
                 G2pdG.UpdatePeakGrid(G2frame,data)
@@ -2176 +2179 @@
       triggers the addition of a d-zero.    
     '''
+    G2frame.dataFrame.GetStatusBar().SetStatusText('Add strain ring active - LB pick d-zero value')
     StrSta = G2frame.PatternTree.GetItemPyData(
         G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Stress/Strain'))