Changeset 963 for trunk/exports/G2cif.py

Timestamp:

Jun 20, 2013 5:07:33 PM (10 years ago)

Author:

toby

Message:

more CIF work, more docs

File:

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

trunk/exports/G2cif.py

@@ -6 +6 @@
 import os.path
 import GSASIIIO as G2IO
-reload(G2IO)
+#reload(G2IO)
 import GSASIIgrid as G2gd
 import GSASIIstrIO as G2stIO
@@ -13 +13 @@
 import GSASIIlattice as G2lat
 import GSASIIspc as G2spg
+reload(G2spg)
 
 def getCallerDocString(): # for development
@@ -67 +68 @@
 
         def WriteOverall():
-            '''TODO: Write out overall refinement information
+            '''Write out overall refinement information.
+
+            More could be done here, but this is a good start.
             '''
             WriteCIFitem('_pd_proc_info_datetime', self.CIFdate)
@@ -85 +88 @@
             WriteCIFitem('_refine_ls_goodness_of_fit_all',GOF)
 
+            # get restraint info
+            # restraintDict = self.OverallParms.get('Restraints',{})
+            # for i in  self.OverallParms['Constraints']:
+            #     print i
+            #     for j in self.OverallParms['Constraints'][i]:
+            #         print j
             #WriteCIFitem('_refine_ls_number_restraints',TEXT)
             
@@ -300 +309 @@
                         cia+1:'AUiso',cia+2:'AU11',cia+3:'AU22',cia+4:'AU33',
                         cia+5:'AU12',cia+6:'AU13',cia+7:'AU23'}
-            labellist = []
+            self.labellist = []
             
             pfx = str(phasedict['pId'])+'::'
@@ -306 +315 @@
             naniso = 0
             for i,at in enumerate(Atoms):
-                s = PutInCol(MakeUniqueLabel(at[ct-1],labellist),6) # label
+                s = PutInCol(MakeUniqueLabel(at[ct-1],self.labellist),6) # label
                 fval = self.parmDict.get(fpfx+str(i),at[cfrac])
                 if fval == 0.0: continue # ignore any atoms that have a occupancy set to 0 (exact)
@@ -354 +363 @@
                 if fval == 0.0: continue # ignore any atoms that have a occupancy set to 0 (exact)
                 if at[cia] == 'I': continue
-                s = PutInCol(labellist[i],6) # label
+                s = PutInCol(self.labellist[i],6) # label
                 for j in (2,3,4,5,6,7):
                     sigdig = -0.0009
@@ -444 +453 @@
                           G2mth.ValEsd(cellmass/Z,-0.09,True))
 
+        def WriteDistances(phasenam,SymOpList,offsetList,symOpList,G2oprList):
+            '''Report bond distances and angles for the CIF
+
+            Note that _geom_*_symmetry_* fields are values of form
+            n_klm where n is the symmetry operation in SymOpList (counted
+            starting with 1) and (k-5, l-5, m-5) are translations to add
+            to (x,y,z). See
+            http://www.iucr.org/__data/iucr/cifdic_html/1/cif_core.dic/Igeom_angle_site_symmetry_.html
+
+            TODO: need a method to select publication flags for distances/angles
+            '''
+            phasedict = self.Phases[phasenam] # pointer to current phase info            
+            Atoms = phasedict['Atoms']
+            cx,ct,cs,cia = phasedict['General']['AtomPtrs']
+            fpfx = str(phasedict['pId'])+'::Afrac:'        
+            cfrac = cx+3
+            # loop over interatomic distances for this phase
+            WriteCIFitem('\n# MOLECULAR GEOMETRY')
+            WriteCIFitem('loop_' + 
+                         '\n\t_geom_bond_atom_site_label_1' +
+                         '\n\t_geom_bond_atom_site_label_2' + 
+                         '\n\t_geom_bond_distance' + 
+                         '\n\t_geom_bond_site_symmetry_1' + 
+                         '\n\t_geom_bond_site_symmetry_2' + 
+                         '\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]
+
+
+            # loop over interatomic angles for this phase
+            WriteCIFitem('loop_' + 
+                         '\n\t_geom_angle_atom_site_label_1' + 
+                         '\n\t_geom_angle_atom_site_label_2' + 
+                         '\n\t_geom_angle_atom_site_label_3' + 
+                         '\n\t_geom_angle' + 
+                         '\n\t_geom_angle_site_symmetry_1' +
+                         '\n\t_geom_angle_site_symmetry_2' + 
+                         '\n\t_geom_angle_site_symmetry_3' + 
+                         '\n\t_geom_angle_publ_flag')
+
+
         def WritePhaseInfo(phasenam):
-            # see writepha.for
-            print 'TODO: phase info for',phasenam,'goes here'
-            # THINK: how to select publication flags for distances/angles?
+            WriteCIFitem('\n# phase info for '+str(phasenam) + ' follows')
             phasedict = self.Phases[phasenam] # pointer to current phase info            
             WriteCIFitem('_pd_phase_name', phasenam)
@@ -478 +532 @@
 
             # generate symmetry operations including centering and center of symmetry
-            WriteCIFitem('loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz')
-            for i,op in enumerate(G2spg.AllOps(phasedict['General']['SGData']),start=1):
+            SymOpList,offsetList,symOpList,G2oprList = G2spg.AllOps(
+                phasedict['General']['SGData'])
+            WriteCIFitem('loop_ _space_group_symop_id _space_group_symop_operation_xyz')
+            for i,op in enumerate(SymOpList,start=1):
                 WriteCIFitem('   {:3d}  {:}'.format(i,op.lower()))
 
@@ -512 +568 @@
             # report cell contents
             WriteComposition(phasenam)
-#            if not self.quickmode:
-                # report distances and angles
-#                WriteDistances(phasenam)
+            if not self.quickmode:      # report distances and angles
+                WriteDistances(phasenam,SymOpList,offsetList,symOpList,G2oprList)
 
             #raise Exception,'Testing'
-
-            #C now loop over interatomic distances for this phase
-            WriteCIFitem('\n# MOLECULAR GEOMETRY')
-            WriteCIFitem('loop_' + 
-                         '\n\t_geom_bond_atom_site_label_1' +
-                         '\n\t_geom_bond_atom_site_label_2' + 
-                         '\n\t_geom_bond_distance' + 
-                         '\n\t_geom_bond_site_symmetry_1' + 
-                         '\n\t_geom_bond_site_symmetry_2' + 
-                         '\n\t_geom_bond_publ_flag')
-
-            #C now loop over interatomic angles for this phase
-            WriteCIFitem('loop_' + 
-                         '\n\t_geom_angle_atom_site_label_1' + 
-                         '\n\t_geom_angle_atom_site_label_2' + 
-                         '\n\t_geom_angle_atom_site_label_3' + 
-                         '\n\t_geom_angle' + 
-                         '\n\t_geom_angle_site_symmetry_1' +
-                         '\n\t_geom_angle_site_symmetry_2' + 
-                         '\n\t_geom_angle_site_symmetry_3' + 
-                         '\n\t_geom_angle_publ_flag')
 
         def WritePowderData(histlbl):
@@ -968 +1002 @@
                     WriteSingleXtalData(key1)
 
-        # TODO: how to report _pd_proc_ls_peak_cutoff?
         WriteCIFitem('#--' + 15*'eof--' + '#')