Changeset 1026

Timestamp:

Aug 12, 2013 11:26:54 AM (9 years ago)

Author:

toby

Message:

now with distances & angles

File:

• trunk/exports/G2cif.py (modified) (8 diffs)

trunk/exports/G2cif.py

@@ -17 +17 @@
 import datetime as dt
 import os.path
+import sys
 import numpy as np
 import wx
@@ -35 +36 @@
 #reload(G2pg)
 import GSASIIstrMain as G2stMn
-
-DEBUG = False
-#DEBUG = True    #True to skip printing of reflection/powder profile lists
+reload(G2stMn)
+
+DEBUG = True    #True to skip printing of reflection/powder profile lists
 
 def getCallerDocString(): # for development
@@ -66 +67 @@
     
         def openCIF(filnam):
-            self.fp = open(filnam,'w')
+            if DEBUG:
+                self.fp = sys.stdout
+            else:
+                self.fp = open(filnam,'w')
 
         def closeCIF():
-            self.fp.close()
+            if not DEBUG:
+                self.fp.close()
             
         def WriteCIFitem(name,value=''):
@@ -644 +649 @@
             DisAglData = {}
             DisAglCtls = {}
+            # create a list of atoms, but skip atoms with zero occupancy
             xyz = []
+            fpfx = str(phasedict['pId'])+'::Afrac:'        
             for i,atom in enumerate(Atoms):
+                if self.parmDict.get(fpfx+str(i),atom[cfrac]) == 0.0: continue
                 xyz.append([i,]+atom[cn:cn+2]+atom[cx:cx+3])
             if 'DisAglCtls' in generalData:
@@ -660 +668 @@
             DisAglData['OrigAtoms'] = xyz
             DisAglData['TargAtoms'] = xyz
-            DisAglData['SGData'] = generalData['SGData']
             SymOpList,offsetList,symOpList,G2oprList = G2spc.AllOps(
                 generalData['SGData'])
 
-#            print len(SymOpList),len(offsetList),len(symOpList),len(G2oprList)
-#            raise Exception
-
-            
+            xpandSGdata = generalData['SGData'].copy()
+            xpandSGdata.update({'SGOps':symOpList,
+                                'SGInv':False,
+                                'SGLatt':'P',
+                                'SGCen':np.array([[0, 0, 0]]),})
+            DisAglData['SGData'] = xpandSGdata
+
             DisAglData['Cell'] = generalData['Cell'][1:] #+ volume
             if 'pId' in phasedict:
@@ -673 +683 @@
                 DisAglData['covData'] = self.OverallParms['Covariance']
             try:
-                G2stMn.DistAngle(DisAglCtls,DisAglData)
+                AtomLabels,DistArray,AngArray = G2stMn.RetDistAngle(DisAglCtls,DisAglData)
             except KeyError:        # inside DistAngle for missing atom types in DisAglCtls
                 print '**** ERROR - try again but do "Reset" to fill in missing atom types ****'
                     
-
-            raise Exception
-        
             # loop over interatomic distances for this phase
             WriteCIFitem('\n# MOLECULAR GEOMETRY')
@@ -690 +697 @@
                          '\n\t_geom_bond_publ_flag')
 
-            # Note that labels should be read from self.labellist to correspond
-            # to the values reported in the atoms table and zero occupancy atoms
-            # should not be included
-            fpfx = str(phasedict['pId'])+'::Afrac:'        
-            for i,at in enumerate(Atoms):
-                if self.parmDict.get(fpfx+str(i),at[cfrac]) == 0.0: continue
-                lbl = self.labellist[i]
-
+            for i in sorted(AtomLabels.keys()):
+                Dist = DistArray[i]
+                for D in Dist:
+                    line = '  '+PutInCol(AtomLabels[i],6)+PutInCol(AtomLabels[D[0]],6)
+                    sig = D[4]
+                    if sig == 0: sig = -0.00009
+                    line += PutInCol(G2mth.ValEsd(D[3],sig,True),10)
+                    line += "  1_555 "
+                    line += " {:3d}_".format(D[2])
+                    for d in D[1]:
+                        line += "{:1d}".format(d+5)
+                    line += " yes"
+                    WriteCIFitem(line)
 
             # loop over interatomic angles for this phase
-            WriteCIFitem('loop_' + 
+            WriteCIFitem('\nloop_' + 
                          '\n\t_geom_angle_atom_site_label_1' + 
                          '\n\t_geom_angle_atom_site_label_2' + 
@@ -710 +722 @@
                          '\n\t_geom_angle_publ_flag')
 
+            for i in sorted(AtomLabels.keys()):
+                Dist = DistArray[i]
+                for k,j,tup in AngArray[i]:
+                    Dj = Dist[j]
+                    Dk = Dist[k]
+                    line = '  '+PutInCol(AtomLabels[Dj[0]],6)+PutInCol(AtomLabels[i],6)+PutInCol(AtomLabels[Dk[0]],6)
+                    sig = tup[1]
+                    if sig == 0: sig = -0.009
+                    line += PutInCol(G2mth.ValEsd(tup[0],sig,True),10)
+                    line += " {:3d}_".format(Dj[2])
+                    for d in Dj[1]:
+                        line += "{:1d}".format(d+5)
+                    line += "  1_555 "
+                    line += " {:3d}_".format(Dk[2])
+                    for d in Dk[1]:
+                        line += "{:1d}".format(d+5)
+                    line += " yes"
+                    WriteCIFitem(line)
 
         def WritePhaseInfo(phasenam):