Changeset 1127 for trunk/exports/G2export_csv.py

Timestamp:

Oct 29, 2013 11:42:23 AM (10 years ago)

Author:

toby

Message:

more export changes to catch up to data structure updates; update docs; change RF^{2 to use superscript since} 2 is not working -- at least on Mac

File:

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

trunk/exports/G2export_csv.py

@@ -192 +192 @@
         for i,phasenam in enumerate(sorted(histblk['Reflection Lists'])):
             for (
-                h,k,l,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,eqlist,phaselist,Icorr,FFdict
-                ) in histblk['Reflection Lists'][phasenam]:
+                h,k,l,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,Icorr
+                ) in histblk['Reflection Lists'][phasenam]['RefList']:
                 self.Write(fmt.format(h,k,l,pos,Fobs,Fcalc,phase,mult,i))
         self.CloseFile()
@@ -229 +229 @@
         fmt = "{:.0f},{:.0f},{:.0f},{:.3f},{:.2f},{:.4f},{:.2f},{:.2f},{:.0f}"
         for (
-            h,k,l,mult,dsp,Fobs,sigFobs,Fcalc,FobsT,FcalcT,phase,eqlist,phaselist,Icorr,FFdict
-            ) in histblk['Data']:
+            h,k,l,mult,dsp,Fobs,sigFobs,Fcalc,FobsT,FcalcT,phase,Icorr
+            ) in histblk['Data']['RefList']:
             self.Write(fmt.format(h,k,l,dsp,Fobs,sigFobs,Fcalc,phase,mult))
         self.CloseFile()