Changeset 2321

Timestamp:

Jun 15, 2016 7:10:38 AM (5 years ago)

Author:

vondreele

Message:

start on CalcDistSig? & AddAngleDialog? from tablet

Location:

trunk

Files:

• GSASIIexprGUI.py (modified) (4 diffs)
• GSASIIgrid.py (modified) (1 diff)
• GSASIImath.py (modified) (1 diff)

trunk/GSASIIexprGUI.py

@@ -710 +710 @@
         self.Oatom = ''
         self.Tatom = ''
-        
         self.Draw()
         
@@ -825 +824 @@
         self.header = header
         self.pName = Phases.keys()[0]
+        DisAglCtls = {}
+        dlg = G2gd.DisAglDialog(self.panel,DisAglCtls,self.Phases[self.pName]['General'],Reset=False)
+        if dlg.ShowModal() == wx.ID_OK:
+            Phases[self.pName]['General']['DisAglCtls'] = dlg.GetData()
+        dlg.Destroy()
         self.Oatom = ''
-        
+        self.Tatoms = ['','']
         self.Draw()
 
@@ -834 +838 @@
             Obj = event.GetEventObject()
             self.pName = Obj.GetValue()
-            self.Draw()
+            self.Oatom = ''
+            DisAglCtls = {}
+            dlg = G2gd.DisAglDialog(self.panel,DisAglCtls,self.Phases[self.pName]['General'],Reset=False)
+            if dlg.ShowModal() == wx.ID_OK:
+                self.Phases[self.pName]['General']['DisAglCtls'] = dlg.GetData()
+            dlg.Destroy()
+            wx.CallAfter(self.Draw)
             
         def OnOrigAtom(event):
             Obj = event.GetEventObject()
             self.Oatom = Obj.GetValue()
-            self.Draw()
-            
+            wx.CallAfter(self.Draw)            
+
+        def OnTargAtom(event):
+            Obj = event.GetEventObject()
+            self.Tatom = Obj.GetValue()
+            wx.CallAfter(self.Draw)
 
         self.panel.Destroy()
@@ -860 +874 @@
 #        GSASIIpath.IPyBreak()
         atomSizer = wx.BoxSizer(wx.HORIZONTAL)
-        atomSizer.Add(wx.StaticText(self.panel,label=' Origin atom: '),0,WACV)
+        atomSizer.Add(wx.StaticText(self.panel,label=' Origin atom (O in A-O-B): '),0,WACV)
         origAtom = wx.ComboBox(self.panel,value=self.Oatom,choices=aNames,
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
         origAtom.Bind(wx.EVT_COMBOBOX,OnOrigAtom)
-        atomSizer.Add(origAtom,0,WACV)
-        
+        atomSizer.Add(origAtom,0,WACV)        
         mainSizer.Add(atomSizer)
+        mainSizer.Add(wx.StaticText(self.panel,label=' A-O-B angle for A,B: '),0,WACV)
+        neigh = []
+        if self.Oatom:
+#            GSASIIpath.IPyBreak()
+            neigh = G2mth.FindAllNeighbors(Phase,self.Oatom,aNames)
+        bNames = ['',]
+        if neigh:
+            bNames = [item[0]+' d=%.3f'%(item[1]) for item in neigh[0]]
 
 

trunk/GSASIIgrid.py

@@ -3433 +3433 @@
             derivs = np.array(
                 [EvalPSvarDeriv(calcobj,parmDict.copy(),sampleDict[name],var,ESD)
-                 for var,ESD in zip(varyList,sigs)]
-                )
+                 for var,ESD in zip(varyList,sigs)])
             esdList.append(np.sqrt(
-                np.inner(derivs,np.inner(data[name]['covMatrix'],derivs.T))
-                ))
+                np.inner(derivs,np.inner(data[name]['covMatrix'],derivs.T)) ))
             PSvarDict = parmDict.copy()
             PSvarDict.update(sampleDict[name])

trunk/GSASIImath.py

@@ -1529 +1529 @@
     return dist    
    
+def CalcDistSig(distance_dict, distance_atoms, parmDict,covData={}):
+    '''default doc string
+    
+    :param type name: description
+    
+    :returns: type name: description
+    
+    '''
+    def calcDist(Atoms,SyOps,Amat):
+        XYZ = []
+        for i,atom in enumerate(Atoms):
+            Inv,M,T,C,U = SyOps[i]
+            XYZ.append(np.array(atom[1:4]))
+            XYZ[-1] = Inv*(np.inner(M,np.array(XYZ[-1]))+T)+C+U
+            XYZ[-1] = np.inner(Amat,XYZ[-1]).T
+        V1 = XYZ[1]-XYZ[0]
+        return np.sqrt(np.sum(V1**2))
+        
+    if not len(parmDict):
+        return 0.
+    pId = distance_dict['pId']
+    pfx = '%d::'%(pId)
+    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']
+    if symNo < 0:
+        inv = -1
+        symNo *= -1
+    cen = symNo/100
+    op = symNo%100-1
+    M,T = distance_dict['SGData']['SGOps'][op]
+    D = T*inv+distance_dict['SGData']['SGCen'][cen]
+    D += distance_dict['cellNo']
+    Txyz = np.inner(M*inv,Txyz)+D
+    dist = np.sqrt(np.sum(np.inner(Amat,(Txyz-Oxyz))**2))
+
+    sig = -0.001
+    if 'covMatrix' in covData:
+        parmNames = []
+        dx = .00001
+        dadx = np.zeros(6)
+        for i in range(6):
+            ia = i/3
+            ix = i%3
+            Oxyz[ix+1] += dx
+            a0 = calcDist(Oatoms,SyOps,Amat)
+            Oatoms[ia][ix+1] -= 2*dx
+            dadx[i] = (calcDist(Oatoms,SyOps,Amat)-a0)/(2.*dx)
+        covMatrix = covData['covMatrix']
+        varyList = covData['varyList']
+        DistVcov = getVCov(names,varyList,covMatrix)
+        sig = np.sqrt(np.inner(dadx,np.inner(DistVcov,dadx)))
+        if sig < 0.001:
+            sig = -0.001
+    
+    return Dist,sig
+
+def CalcAngle(distance_dict, distance_atoms, parmDict):
+    if not len(parmDict):
+        return 0.
+
+    return 0.   #angle
+
 def getSyXYZ(XYZ,ops,SGData):
     '''default doc string