Changeset 2329

Timestamp:

Jun 17, 2016 6:37:32 AM (7 years ago)

Author:

vondreele

Message:

sequential table distance & angle now OK, esds for distance OK, non yet for angle

Location:

trunk

Files:

• GSASIIgrid.py (modified) (2 diffs)
• GSASIImath.py (modified) (3 diffs)
• GSASIIobj.py (modified) (1 diff)

trunk/GSASIIgrid.py

@@ -2807 +2807 @@
 
     def AddNewAnglePseudoVar(event):
+        obj = None
         dlg = G2exG.AngleDialog(
             G2frame.dataDisplay,Phases,PSvarDict,
@@ -3473 +3474 @@
                 derivs = G2mth.CalcAngleDeriv(obj.angle_dict,obj.angle_atoms, parmDict)
                 pId = obj.angle_dict['pId']
-                aId,bId = obj.distance_atoms
+                aId,bId = obj.angle_atoms
                 varyNames = ['%d::dA%s:%d'%(pId,ip,aId) for ip in ['x','y','z']]
                 varyNames += ['%d::dA%s:%d'%(pId,ip,bId[0]) for ip in ['x','y','z']]

trunk/GSASIImath.py

@@ -1538 +1538 @@
     Oxyz = [parmDict['%s::A%s:%d'%(pId,x,distance_atoms[0])] for x in ['x','y','z']]
     Txyz = [parmDict['%s::A%s:%d'%(pId,x,distance_atoms[1])] for x in ['x','y','z']]
-    inv = 1
     symNo = distance_dict['symNo']
     Tunit = distance_dict['cellNo']
@@ -1584 +1583 @@
     A = [parmDict['%s::A%d'%(pId,i)] for i in range(6)]
     Amat = G2lat.cell2AB(G2lat.A2cell(A))[0]
-    Oxyz = [parmDict['%s::A%s:%d'%(pId,x,distance_atoms[0])] for x in ['x','y','z']]
-    Txyz = [parmDict['%s::A%s:%d'%(pId,x,distance_atoms[1])] for x in ['x','y','z']]
-    inv = 1
-    symNo = distance_dict['symNo']
-    Tunit = distance_dict['cellNo']
-    SGData = distance_dict['SGData']    
-    deriv = getDistDerv(Oxyz,Txyz,Amat,Tunit,symNo,SGData)
+    Oxyz = [parmDict['%s::A%s:%d'%(pId,x,angle_atoms[0])] for x in ['x','y','z']]
+    Axyz = [parmDict['%s::A%s:%d'%(pId,x,angle_atoms[1][0])] for x in ['x','y','z']]
+    Bxyz = [parmDict['%s::A%s:%d'%(pId,x,angle_atoms[1][1])] for x in ['x','y','z']]
+    symNo = angle_dict['symNo']
+    Tunit = angle_dict['cellNo']
+    SGData = angle_dict['SGData']    
+    deriv = getAngleDerv(Oxyz,Axyz,Bxyz,Amat,Tunit,symNo,SGData)
     return deriv
 
 def getSyXYZ(XYZ,ops,SGData):
-    '''default doc stringvec
-    
+    '''default doc 
     
     :param type name: description
@@ -1904 +1902 @@
         Txyz[i] -= dx
     return deriv
+    
+def getAngleDerv(Oxyz,Axyz,Bxyz,Amat,Tunit,symNo,SGData):
+    dx = .00001
+    deriv = np.zeros(9)
+
+
+    return deriv
+    
     
 def getAngSig(VA,VB,Amat,SGData,covData={}):

trunk/GSASIIobj.py

@@ -2048 +2048 @@
 #            GSASIIpath.IPyBreak()
             dist = G2mth.CalcDist(self.eObj.distance_dict, self.eObj.distance_atoms, self.parmDict)
-            self.su = G2mth.CalcDistSu(self.eObj.distance_dict, self.eObj.distance_atoms, self.parmDict)
             return dist
         elif self.eObj.expression.startswith('Angle'):
             angle = G2mth.CalcAngle(self.eObj.angle_dict, self.eObj.angle_atoms, self.parmDict)
-            self.su = G2mth.CalcAngleSu(self.eObj.angle_dict, self.eObj.angle_atoms, self.parmDict)
             return angle
         if self.compiledExpr is None: