Changeset 1153 for trunk/GSASIIplot.py

Timestamp:

Nov 26, 2013 2:32:25 PM (9 years ago)

Author:

vondreele

Message:

fix to multiimage Integrate
fix to calibration
new geometric correction - takes account for tilted detectors

File:

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

trunk/GSASIIplot.py

@@ -2160 +2160 @@
                 if (0 <= xpix <= sizexy[0]) and (0 <= ypix <= sizexy[1]):
                     Int = G2frame.ImageZ[ypix][xpix]
-                tth,azm,dsp = G2img.GetTthAzmDsp(xpos,ypos,Data)
+                tth,azm,D,dsp = G2img.GetTthAzmDsp(xpos,ypos,Data)
                 Q = 2.*math.pi/dsp
                 if G2frame.MaskKey in ['p','f']:
@@ -2314 +2314 @@
                         rings.remove(ring)
             else:
-                tth,azm,dsp = G2img.GetTthAzmDsp(Xpos,Ypos,Data)
+                tth,azm,dsp = G2img.GetTthAzmDsp(Xpos,Ypos,Data)[:3]
                 itemPicked = str(G2frame.itemPicked)
                 if 'Line2D' in itemPicked and PickName == 'Image Controls':