Changeset 4903 for trunk/GSASIIplot.py

Timestamp:

May 17, 2021 11:23:03 AM (3 years ago)

Author:

vondreele

Message:

fix 2 issues in HessianLSQ for SVN LinAlgErrors?
fix a typo in G2plot for SASD plot display
change GetTthAzmDsp? --> GeTthAzmDsp2 in G2plot & G2Image
comment old GetTthAzmDsp? code - fails in recent python/numpy versions; replaced by GetTthAzmDsp2
change GetTthAzmG --> GetTthAzm2 in G2image

File:

• trunk/GSASIIplot.py (modified) (6 diffs)

trunk/GSASIIplot.py

@@ -3591 +3591 @@
                             CalcLine = Plot.plot(X,Z/ymax,colors[1],picker=False,label=incCptn('calc'))                 #Ic
                         else:
-                            Plot.plot(X,YB,color=colors[0],marler=pP,
+                            Plot.plot(X,YB,color=colors[0],marker=pP,
                                 picker=True,pickradius=3.,clip_on=Clip_on,label=incCptn('obs'))
                             Plot.plot(X,ZB,colors[2],picker=False,label=incCptn('calc'))
@@ -7335 +7335 @@
                 if (0 <= xpix < sizexy[0]) and (0 <= ypix < sizexy[1]):
                     Int = G2frame.ImageZ[ypix][xpix]
-                tth,azm,D,dsp = G2img.GetTthAzmDsp(xpos,ypos,Data)
+                tth,azm,D,dsp = G2img.GetTthAzmDsp2(xpos,ypos,Data)
                 Q = 2.*math.pi/dsp
                 if G2frame.StrainKey:
@@ -7434 +7434 @@
                 xpos = event.xdata
                 ypos = event.ydata
-                tth,azm,D,dsp = G2img.GetTthAzmDsp(xpos,ypos,Data)
+                tth,azm,D,dsp = G2img.GetTthAzmDsp2(xpos,ypos,Data)
                 G2frame.calibDmin.SetValue(dsp)
             elif event.key in ['x',]:
@@ -7479 +7479 @@
                 # for now ignore the movement until it moves back in
                 return
-            tth,azm,D,dsp = G2img.GetTthAzmDsp(event.xdata,event.ydata,Data)
+            tth,azm,D,dsp = G2img.GetTthAzmDsp2(event.xdata,event.ydata,Data)
             itemPicked = str(G2frame.itemPicked)
             if 'Itth' in itemPicked:
@@ -7613 +7613 @@
                 itemNum = G2frame.itemPicked.itemNumber
                 tth,azm,thick = Masks['Arcs'][itemNum]
-                tthN,azmN,D,dsp = G2img.GetTthAzmDsp(Xpos,Ypos,Data)
+                tthN,azmN,D,dsp = G2img.GetTthAzmDsp2(Xpos,Ypos,Data)
                 if event.button == 1:
                     if pickType == 'ArcInner':
@@ -7922 +7922 @@
             if not Xpos or not Ypos or Page.toolbar.AnyActive():  #got point out of frame or zoom/pan selected
                 return
-            tth,azm,dsp = G2img.GetTthAzmDsp(Xpos,Ypos,Data)[:3]
+            tth,azm,dsp = G2img.GetTthAzmDsp2(Xpos,Ypos,Data)[:3]
             itemPicked = str(G2frame.itemPicked)
             try: