Changeset 3299

Timestamp:

Feb 28, 2018 11:59:19 PM (4 years ago)

Author:

toby

Message:

Add Q to powder CSV export

File:

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

trunk/exports/G2export_csv.py

@@ -26 +26 @@
 import GSASIImath as G2mth
 import GSASIIpwd as G2pwd
+import GSASIIlattice as G2lat
 
 def WriteList(obj,headerItems):
@@ -178 +179 @@
         self.OpenFile(filename)
         histblk = self.Histograms[TreeName]
-        WriteList(self,("x","y_obs","weight","y_calc","y_bkg"))
-        digitList = 2*((13,3),) + ((13,5),) + 2*((13,3),)
+        Parms = self.Histograms[TreeName]['Instrument Parameters'][0]
+        WriteList(self,("x","y_obs","weight","y_calc","y_bkg","Q"))
+        digitList = 2*((13,3),) + ((13,5),) + 3*((13,3),)
         for vallist in zip(histblk['Data'][0],
                        histblk['Data'][1],
@@ -186 +188 @@
                        histblk['Data'][4],
                        #histblk['Data'][5],
+                       2*np.pi/G2lat.Pos2dsp(Parms,histblk['Data'][0])
                        ):
             line = ""