Changeset 1786 for trunk/GSASIIplot.py

Timestamp:

Apr 10, 2015 1:14:03 PM (8 years ago)

Author:

vondreele

Message:

fix anomalous dispersion calcs.
fix SC weights on derivatives

File:

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

trunk/GSASIIplot.py

@@ -647 +647 @@
             if 'HKLF' in Name:
                 Fosq,sig,Fcsq = refl[5+Super:8+Super]
+                if refl[3+Super] < 0:
+                    Fosq,sig,Fcsq = [0,1,0]
             else:
                 Fosq,sig,Fcsq = refl[8+Super],1.0,refl[9+Super]
@@ -696 +698 @@
         return HKL,zip(list(R),C)
 
+    def GetTruePosition(xy):
+        View = glGetIntegerv(GL_VIEWPORT)
+        Proj = glGetDoublev(GL_PROJECTION_MATRIX)
+        Model = glGetDoublev(GL_MODELVIEW_MATRIX)
+        Zmax = 1.
+        for i,ref in enumerate(hklRef):
+            h,k,l = ref[1:4]
+            X,Y,Z = gluProject(h,k,l,Model,Proj,View)
+            XY = [int(X),int(Y)]
+            print xy,XY
+            if np.allclose(xy,XY,atol=10):
+                Zmax = Z
+                return [h,k,l]
+                        
     def SetTranslation(newxy):
 #first get translation vector in screen coords.       
@@ -779 +795 @@
                 Q = drawingData['Quaternion']
             Draw('move')
+#        else:
+#            hkl = GetTruePosition(newxy)
         
     def OnMouseWheel(event):