Changeset 1012

Timestamp:

Jul 31, 2013 9:25:27 AM (10 years ago)

Author:

vondreele

Message:

add svn header to G2cif.py and GSASIIpath to imports
add DEBUG to skip prnting of profile & reflections
add profile parm cif output
work on MC/SA scrolling

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (5 diffs)
• exports/G2cif.py (modified) (9 diffs)

trunk/GSASIIphsGUI.py

@@ -3968 +3968 @@
 ################################################################################
 
-    def UpdateMCSA(refresh=True):
+    def UpdateMCSA(Scroll=0):
         Indx = {}
         
@@ -4251 +4251 @@
                         else:       #March Dollase
                             Models[0]['Coef'][0] = val
-                    wx.CallAfter(UpdateMCSA)
+                    wx.CallAfter(UpdateMCSA,MCSA.GetScrollPos(wx.VERTICAL))
                     G2plt.PlotStructure(G2frame,data)
                 elif c == 1:
@@ -4260 +4260 @@
                     resultsTable.SetValue(r,c,Results[r][1])
                     resultsGrid.ForceRefresh()
-                        
                 
             resultsSizer = wx.BoxSizer(wx.VERTICAL)
@@ -4290 +4289 @@
         
         # UpdateMCSA executable code starts here
-        if refresh:
-            MCSA.DestroyChildren()
         general = data['General']
         Amat,Bmat = G2lat.cell2AB(general['Cell'][1:7])
@@ -4331 +4328 @@
 
         SetPhaseWindow(G2frame.dataFrame,MCSA,mainSizer)
+        MCSA.Scroll(0,Scroll)
             
     def OnRunMultiMCSA(event):

trunk/exports/G2cif.py

@@ +1 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#G2cif
+########### SVN repository information ###################
+# $Date: 2013-07-22 20:57:37 -0500 (Mon, 22 Jul 2013) $
+# $Author: toby $
+# $Revision: 1006 $
+# $URL: https://subversion.xray.aps.anl.gov/pyGSAS/trunk/exports/G2cif.py $
+# $Id: G2cif.py 1006 2013-07-23 01:57:37Z toby $
+########### SVN repository information ###################
 '''Development code to export a GSAS-II project as a CIF
 The heavy lifting is done in method export
@@ -8 +18 @@
 import os.path
 import numpy as np
+import GSASIIpath
+GSASIIpath.SetVersionNumber("$Revision: 1006 $")
 import GSASIIIO as G2IO
 #reload(G2IO)
@@ -19 +31 @@
 import GSASIIspc as G2spg
 #reload(G2spg)
+
+DEBUG = True    #True to skip printing of reflection/powder profile lists
 
 def getCallerDocString(): # for development
@@ -243 +257 @@
             string description. Will only be called on PWDR histograms
             '''
-            #print instparmdict[0].keys()
-            return 'TODO: Instrument profile goes here'
+            s = ''
+            inst = instparmdict[0]
+            if 'C' in inst['Type'][0]:
+                s = 'Finger-Cox-Jephcoat function parameters U, V, W, X, Y, SH/L:\n   '
+                for item in ['U','V','W','X','Y','SH/L']:
+                    s += G2mth.ValEsd(inst[item][1],-.009)+', '                    
+            elif 'T' in inst['Type'][0]:    #to be tested after TOF Rietveld done
+                s = 'Von Dreele-Jorgenson-Windsor function parameters\n'+ \
+                    '   alpha, beta-0, beta-1, beta-q, sig-0, sig-1, sig-q, X, Y:\n   '
+                for item in ['alpha','bet-0','bet-1','bet-q','sig-0','sig-1','sig-q','X','Y']:
+                    s += G2mth.ValEsd(inst[item][1],-.009)+', '
+            return s
 
         def FormatPhaseProfile(phasenam):
@@ -709 +733 @@
             if not oneblock:                 # instrumental profile terms go here
                 WriteCIFitem('_pd_proc_ls_profile_function', 
-                             FormatInstProfile(histblk["Instrument Parameters"]))
+                    FormatInstProfile(histblk["Instrument Parameters"]))
 
             #refprx = '_refln.' # mm
@@ -749 +773 @@
                 refcount += len(histblk['Reflection Lists'][phasenam])
                 for ref in histblk['Reflection Lists'][phasenam]:
+                    if DEBUG:
+                        print 'DEBUG: skip reflection list'
+                        break
                     if hklmin is None:
                         hklmin = ref[0:3]
@@ -832 +859 @@
                                             histblk['Data'][3],
                                             histblk['Data'][4]):
+                if DEBUG:
+                    print 'DEBUG: skip reflection list'
+                    break
                 if fixedstep:
                     s = ""
@@ -1164 +1194 @@
                     # report instrumental profile terms
                     WriteCIFitem('_pd_proc_ls_profile_function',
-                                 FormatInstProfile(histblk["Instrument Parameters"]))
-                    WriteCIFitem('# Information for histogram '+str(i)+': '+
-                                 hist)
+                        FormatInstProfile(histblk["Instrument Parameters"]))
+                    WriteCIFitem('# Information for histogram '+str(i)+': '+hist)
                     WriteCIFitem('_pd_block_id',datablockidDict[hist])
                     WritePowderTemplate()
@@ -1176 +1205 @@
                     WriteCIFitem('\ndata_'+self.CIFname+"_sx_"+str(i))
                     #instnam = histblk["Instrument Parameters"][0]['InstrName']
-                    WriteCIFitem('# Information for histogram '+str(i)+': '+
-                                 hist)
+                    WriteCIFitem('# Information for histogram '+str(i)+': '+hist)
                     WriteCIFitem('_pd_block_id',datablockidDict[hist])
                     WriteSnglXtalTemplate()