Changeset 4549

Timestamp:

Aug 19, 2020 2:53:47 PM (3 years ago)

Author:

vondreele

Message:

use AddToNotebook? in Refine - remove wx.CallAfter? for self.ReloadFrom? GPX so AddToNotebook? would work
Add csv Exporter for reflectometry data
replace all calls to G2py3.FormatValue? with explicit %.6g formats in G2export_csv - FormatValue? screwed up values.

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (2 diffs)
• exports/G2export_csv.py (modified) (5 diffs)

trunk/GSASIIdataGUI.py

@@ -5034 +5034 @@
         if OK:
             Rw = Msg['Rwp']
+            rtext = 'LS Refinement: Rw = %.3f%%, GOF = %.2f, Nobs = %d, Max delt/sig = %.3f'%(Msg['Rwp'],Msg['GOF'],Msg['Nobs'],Msg['Max shft/sig'])
             lamMax = Msg.get('lamMax',0.001)
             lst = os.path.splitext(os.path.abspath(self.GSASprojectfile))[0]
@@ -5045 +5046 @@
                 if dlg2.ShowModal() == wx.ID_OK:
                     if refPlotUpdate: refPlotUpdate({},restore=True)
-                    wx.CallAfter(self.reloadFromGPX)
+                    self.reloadFromGPX
                 else:
                     if refPlotUpdate: refPlotUpdate({},restore=True)
+                self.AddToNotebook(rtext)
             finally:
                 dlg2.Destroy()

trunk/exports/G2export_csv.py

@@ -212 +212 @@
             for val,digits in zip(vallist,digitList):
                 if line: line += ','
-                line += G2py3.FormatValue(val,digits)
+                line += '%.6g'%val
+#                line += G2py3.FormatValue(val,digits)
             self.Write(line)
         self.CloseFile()
@@ -284 +285 @@
             for val,digits in zip(vallist,digitList):
                 if line: line += ','
-                line += G2py3.FormatValue(val,digits)
+                line += '%.6g'%val
+#                line += G2py3.FormatValue(val,digits)
             self.Write(line)
         self.CloseFile()
@@ -439 +441 @@
             for val,digits in zip(vallist,digitList):
                 if line: line += ','
-                line += G2py3.FormatValue(val,digits)
+                line += '%.6g'%val
+#                line += G2py3.FormatValue(val,digits)
             self.Write(line)
         self.CloseFile()
@@ -484 +487 @@
         self.OpenFile(filename)
         histblk = self.Histograms[TreeName]
-        # if len(self.Histograms[TreeName]['Models']['Size']['Distribution']):
-        #     self.Write('"Size Distribution"')
-        #     Distr = np.array(self.Histograms[TreeName]['Models']['Size']['Distribution'])
-        #     WriteList(self,("bin_pos","bin_width","bin_value"))
-        #     digitList = 2*((13,3),)+((13,4,'g'),)
-        #     for bindata in Distr.T:
-        #         line = ""
-        #         for val,digits in zip(bindata,digitList):
-        #             if line: line += ','
-        #             line += G2py3.FormatValue(val,digits)
-        #         self.Write(line)            
         self.Write('"Reflectometry data"')
         Parms = self.Histograms[TreeName]['Instrument Parameters'][0]
@@ -516 +508 @@
             for val,digits in zip(vallist,digitList):
                 if line: line += ','
-                line += G2py3.FormatValue(val,digits)
+                line += '%.6g'%val
+#                line += G2py3.FormatValue(val,digits)
             self.Write(line)
         self.CloseFile()