Changeset 1115 for trunk/exports/G2export_shelx.py

Timestamp:

Oct 18, 2013 4:00:32 PM (9 years ago)

Author:

toby

Message:

rework exports for new types

File:

• trunk/exports/G2export_shelx.py (modified) (3 diffs)

trunk/exports/G2export_shelx.py

@@ -26 +26 @@
         super(self.__class__,self).__init__( # fancy way to say <parentclass>.__init__
             G2frame=G2frame,
-            formatName = 'SHELX',
+            formatName = 'SHELX .ins',
             extension='.ins',
             longFormatName = 'Export phase as SHELX .ins file'
@@ -38 +38 @@
         import re
         # the export process starts here
+        self.InitExport(event)
         # load all of the tree into a set of dicts
         self.loadTree()
         # create a dict with refined values and their uncertainties
         self.loadParmDict()
-        if self.SetupExport(event,                         # set export parameters
-                            AskFile=True
-                            ): return 
+        if self.ExportSelect(  # set export parameters
+            AskFile=True): return 
         for phasenam in self.phasenam:
             phasedict = self.Phases[phasenam] # pointer to current phase info            
@@ -56 +56 @@
             # title line
             self.Write("TITL from "+str(self.G2frame.GSASprojectfile)+", phase "+str(phasenam))
-            # get & write cell parameters 
-            pfx = str(phasedict['pId'])+'::'
-            A,sigA = G2stIO.cellFill(pfx,phasedict['General']['SGData'],self.parmDict,self.sigDict)
-            self.Write("CELL 0.5 {:.5f} {:.5f} {:.5f} {:.3f} {:.3f} {:.3f}".format(*G2lat.A2cell(A)))
+            # get & write cell parameters
+            cell,sig = self.GetCell(phasenam)
+            self.Write("CELL 0.5 {:.5f} {:.5f} {:.5f} {:.3f} {:.3f} {:.3f}".format(*cell[:6]))
             # Shelx lattice number
             lattnum = {'P':1,'I':2,'R':2,'F':3,'A':4,'B':5,'C':6}.get(phasedict['General']['SGData']['SGLatt'],0)