Changeset 1029

Timestamp:

Aug 12, 2013 3:51:57 PM (9 years ago)

Author:

vondreele

Message:

fix some things enCIFr whines about

Location:

trunk

Files:

• GSASIIgrid.py (modified) (3 diffs)
• exports/G2cif.py (modified) (8 diffs)

trunk/GSASIIgrid.py

@@ -2403 +2403 @@
         data['F**2'] = True
         data['minF/sig'] = 0
+    if 'Author' not in data:
+        data['Author'] = 'no name'
     #end patch
 
@@ -2523 +2525 @@
         return LSSizer
         
+    def AuthSizer():
+
+        def OnAuthor(event):
+            data['Author'] = auth.GetValue()
+
+        Author = data['Author']
+        authSizer = wx.BoxSizer(wx.HORIZONTAL)
+        authSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' CIF Author (last, first):'),0,wx.ALIGN_CENTER_VERTICAL)
+        auth = wx.TextCtrl(G2frame.dataDisplay,-1,value=Author,style=wx.TE_PROCESS_ENTER)
+        auth.Bind(wx.EVT_TEXT_ENTER,OnAuthor)
+        auth.Bind(wx.EVT_KILL_FOCUS,OnAuthor)
+        authSizer.Add(auth,0,wx.ALIGN_CENTER_VERTICAL)
+        return authSizer
+        
+        
     if G2frame.dataDisplay:
         G2frame.dataDisplay.Destroy()
@@ -2537 +2554 @@
     mainSizer.Add((5,5),0)
     mainSizer.Add(SeqSizer())
+    mainSizer.Add((5,5),0)
+    mainSizer.Add(AuthSizer())
     mainSizer.Add((5,5),0)
         

trunk/exports/G2cif.py

@@ -38 +38 @@
 reload(G2stMn)
 
-DEBUG = True    #True to skip printing of reflection/powder profile lists
+DEBUG = False    #True to skip printing of reflection/powder profile lists
 
 def getCallerDocString(): # for development
@@ -113 +113 @@
             #WriteCIFitem('_refine_ls_shift/su_max',DAT1)
             #WriteCIFitem('_refine_ls_shift/su_mean',DAT2)
-            WriteCIFitem('_computing_structure_refinement','GSAS-II')
+            WriteCIFitem('_computing_structure_refinement','GSAS-II (Toby & Von Dreele, 2013)')
             try:
                 vars = str(len(self.OverallParms['Covariance']['varyList']))
@@ -300 +300 @@
             if 'C' in inst['Type'][0]:
                 s = 'Finger-Cox-Jephcoat function parameters U, V, W, X, Y, SH/L:\n'
-                s += '  peak variance(Gauss) = Utan(Th)^2+Vtan(Th)+W:\n'
+                s += '  peak variance(Gauss) = Utan(Th)^2^+Vtan(Th)+W:\n'
                 s += '  peak HW(Lorentz) = X/cos(Th)+Ytan(Th); SH/L = S/L+H/L\n'
-                s += '  U, V, W in (centideg)^2, X & Y in centideg\n    '
+                s += '  U, V, W in (centideg)^2^, X & Y in centideg\n    '
                 for item in ['U','V','W','X','Y','SH/L']:
                     name = hfx+item
@@ -362 +362 @@
                         s += G2mth.ValEsd(size[1][i],sig)+', '
                         i = 2    #skip the aniso value                
-                s += '\n  Mustrain model "%s" for %s (10^6)\n  '%(mustrain[0],phasenam)
+                s += '\n  Mustrain model "%s" for %s (10^6^)\n  '%(mustrain[0],phasenam)
                 names = ['Mustrain;i','Mustrain;mx']
                 if 'uniax' in mustrain[0]:
@@ -507 +507 @@
                         var = pfx+varnames[cia+j]+":"+str(i)
                         t += self.parmDict.get(var,at[cia+j])
-                for j in (cx,cx+1,cx+2,cx+3,cia+1):
+                for j in (cx,cx+1,cx+2,cx+3,cia,cia+1):
                     if j in (cx,cx+1,cx+2):
                         dig = 11
@@ -514 +514 @@
                         dig = 10
                         sigdig = -0.009
-                    var = pfx+varnames[j]+":"+str(i)
-                    dvar = pfx+"d"+varnames[j]+":"+str(i)
-                    if dvar not in self.sigDict:
-                        dvar = var
-                    if j == cia+1 and adp == 'Uani ':
-                        val = t/3.
-                        sig = sigdig
+                    if j == cia:
+                        s += adp
                     else:
-                        #print var,(var in self.parmDict),(var in self.sigDict)
-                        val = self.parmDict.get(var,at[j])
-                        sig = self.sigDict.get(dvar,sigdig)
-                    s += PutInCol(G2mth.ValEsd(val,sig),dig)
-                s += adp
+                        var = pfx+varnames[j]+":"+str(i)
+                        dvar = pfx+"d"+varnames[j]+":"+str(i)
+                        if dvar not in self.sigDict:
+                            dvar = var
+                        if j == cia+1 and adp == 'Uani ':
+                            val = t/3.
+                            sig = sigdig
+                        else:
+                            #print var,(var in self.parmDict),(var in self.sigDict)
+                            val = self.parmDict.get(var,at[j])
+                            sig = self.sigDict.get(dvar,sigdig)
+                        s += PutInCol(G2mth.ValEsd(val,sig),dig)
                 s += PutInCol(at[cs+1],3)
                 WriteCIFitem(s)
@@ -775 +777 @@
             SymOpList,offsetList,symOpList,G2oprList = G2spc.AllOps(
                 phasedict['General']['SGData'])
-            WriteCIFitem('loop_ _space_group_symop_id _space_group_symop_operation_xyz')
+            WriteCIFitem('loop_\n    _space_group_symop_id\n    _space_group_symop_operation_xyz')
             for i,op in enumerate(SymOpList,start=1):
                 WriteCIFitem('   {:3d}  {:}'.format(i,op.lower()))
@@ -1053 +1055 @@
             lowlim,highlim = histblk['Limits'][1]
 
-            for x,yobs,yw,ycalc,ybkg in zip(histblk['Data'][0],
-                                            histblk['Data'][1],
-                                            histblk['Data'][2],
-                                            histblk['Data'][3],
-                                            histblk['Data'][4]):
-                if lowlim <= x <= highlim:
-                    pass
-                else:
-                    yw = 0.0 # show the point is not in use
-
-                if fixedstep:
-                    s = ""
-                else:
-                    s = PutInCol(G2mth.ValEsd(x-zero,-0.00009),10)
-                s += PutInCol(Yfmt(ndec,yobs),12)
-                s += PutInCol(Yfmt(ndec,ycalc),12)
-                s += PutInCol(Yfmt(ndec,ybkg),11)
-                s += PutInCol(Yfmt(ndecSU,yw),9)
-                WriteCIFitem("  "+s)
+            if DEBUG:
+                print 'DEBUG: skip profile list'
+            else:    
+                for x,yobs,yw,ycalc,ybkg in zip(histblk['Data'][0],
+                                                histblk['Data'][1],
+                                                histblk['Data'][2],
+                                                histblk['Data'][3],
+                                                histblk['Data'][4]):
+                    if lowlim <= x <= highlim:
+                        pass
+                    else:
+                        yw = 0.0 # show the point is not in use
+    
+                    if fixedstep:
+                        s = ""
+                    else:
+                        s = PutInCol(G2mth.ValEsd(x-zero,-0.00009),10)
+                    s += PutInCol(Yfmt(ndec,yobs),12)
+                    s += PutInCol(Yfmt(ndec,ycalc),12)
+                    s += PutInCol(Yfmt(ndec,ybkg),11)
+                    s += PutInCol(Yfmt(ndecSU,yw),9)
+                    WriteCIFitem("  "+s)
 
         def WriteSingleXtalData(histlbl):