Changeset 2132 for trunk/exports

Timestamp:

Jan 22, 2016 10:10:43 AM (9 years ago)

Author:

vondreele

Message:

more rationalization of FWHM calculations

Location:

trunk/exports

Files:

• G2export_csv.py (modified) (2 diffs)
• G2export_examples.py (modified) (2 diffs)

trunk/exports/G2export_csv.py ¶

@@ -268 +268 @@
                     else:        #convert to deg        
                         h,k,l,m,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,Icorr,Prfo = refItem[:14]
-                        FWHM = G2pwd.getgamFW(gam,sig)
-                        self.Write(fmt.format(h,k,l,m,pos,Fobs,Fcalc,phase,mult,    \
-                            np.sqrt(max(sig,0.0001))/100.,gam/100.,FWHM/100.,i))
+                        s = np.sqrt(max(sig,0.0001))/100.   #var -> sig in deg
+                        g = gam/100.    #-> deg
+                        FWHM = G2pwd.getgamFW(g,s)
+                        self.Write(fmt.format(h,k,l,m,pos,Fobs,Fcalc,phase,mult,s,g,FWHM,i))
             else:
                 WriteList(self,("h","k","l",tname,"F_obs","F_calc","phase","mult","sig","gam","FWHM","Prfo","phase #"))
@@ -285 +286 @@
                     else:        #convert to deg        
                         h,k,l,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,Icorr,Prfo = refItem[:13]
-                        FWHM = G2pwd.getgamFW(gam,sig)
-                        self.Write(fmt.format(h,k,l,pos,Fobs,Fcalc,phase,mult,  \
-                            np.sqrt(max(sig,0.0001))/100.,gam/100.,FWHM/100.,Prfo,i))
+                        g = gam/100.
+                        s = np.sqrt(max(sig,0.0001))/100.
+                        FWHM = G2pwd.getgamFW(g,s)
+                        self.Write(fmt.format(h,k,l,pos,Fobs,Fcalc,phase,mult,s,g,FWHM,Prfo,i))
         self.CloseFile()
         print(str(hist)+'reflections written to file '+str(self.fullpath))

trunk/exports/G2export_examples.py ¶

@@ -212 +212 @@
                     if 'T' in phasDict['Type']:
                         h,k,l,m,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,x,x,x,x,prfo = refItem[:17]
-                        FWHM = 2.*G2pwd.getgamFW(gam,sig)
+                        FWHM = G2pwd.getgamFW(gam,sig)
                         self.Write(fmt.format(hklfmt.format(h,k,l,m),pos,Fobs,Fcalc,phase,mult,sig,gam,FWHM,prfo))
                     else:
                         h,k,l,m,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,x,prfo = refItem[:14]
-                        FWHM = 2.*G2pwd.getgamFW(gam,sig)
-                        self.Write(fmt.format(hklfmt.format(h,k,l,m),pos,Fobs,Fcalc,phase,mult, \
-                            np.sqrt(max(sig,0.0001))/100.,gam/100.,FWHM/100.,prfo))
+                        g = gam/100.    #centideg -> deg
+                        s = np.sqrt(max(sig,0.0001))/100.   #var -> sig in deg
+                        FWHM = G2pwd.getgamFW(g,s)  #FWHM
+                        self.Write(fmt.format(hklfmt.format(h,k,l,m),pos,Fobs,Fcalc,phase,mult,s,g,FWHM,prfo))
             else:
                 self.Write(94*'=')
@@ -233 +234 @@
                     if 'T' in phasDict['Type']:
                         h,k,l,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,x,x,x,x,prfo = refItem[:16]
-                        FWHM = 2.*G2pwd.getgamFW(gam,sig)
+                        FWHM = G2pwd.getgamFW(gam,sig)
                         self.Write(fmt.format(hklfmt.format(h,k,l),pos,Fobs,Fcalc,phase,mult,np.sqrt(max(sig,0.0001)),gam,FWHM,prfo))
                     else:
                         h,k,l,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,x,prfo = refItem[:13]
-                        FWHM = 2.*G2pwd.getgamFW(gam,sig)
+                        g = gam/100.    #centideg -> deg
+                        s = np.sqrt(max(sig,0.0001))/100.   #var -> sig in deg
+                        FWHM = G2pwd.getgamFW(g,s)
                         self.Write(fmt.format(hklfmt.format(h,k,l),pos,Fobs,Fcalc,phase,mult,   \
-                            np.sqrt(max(sig,0.0001))/100.,gam/100.,FWHM/100.,prfo))
+                            s,g,FWHM,prfo))
         self.CloseFile()
         print(str(hist)+'reflections written to file '+str(self.fullpath))