Changeset 1761 for trunk/exports


Ignore:
Timestamp:
Mar 24, 2015 4:10:52 PM (7 years ago)
Author:
vondreele
Message:

better fix to export csv reflections
change default I/Ib for strain picking
fix bugs in powder extinction calcs.
remove stray line in G2strMath

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/exports/G2export_csv.py

    r1760 r1761  
    250250                fmt = "{:.0f},{:.0f},{:.0f},{:.0f},{:.3f},{:.3f},{:.3f},{:.2f},{:.0f},{:d}"
    251251                refList = phasDict['RefList']
    252                 for (
    253                     h,k,l,m,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,Icorr,x,x,x
    254                     ) in refList:
     252                for refItem in refList:
     253                    h,k,l,m,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,Icorr = refItem[:12]
    255254                    self.Write(fmt.format(h,k,l,m,pos,Fobs,Fcalc,phase,mult,i))               
    256255            else:
     
    258257                fmt = "{:.0f},{:.0f},{:.0f},{:.3f},{:.3f},{:.3f},{:.2f},{:.0f},{:d}"
    259258                refList = phasDict['RefList']
    260                 for (
    261                     h,k,l,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,Icorr,x,x,x
    262                     ) in refList:
     259                for refItem in refList:
     260                    h,k,l,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,Icorr = refItem[:11]
    263261                    self.Write(fmt.format(h,k,l,pos,Fobs,Fcalc,phase,mult,i))
    264262        self.CloseFile()
Note: See TracChangeset for help on using the changeset viewer.