Changeset 1078

Timestamp:

Oct 3, 2013 1:52:21 PM (9 years ago)

Author:

vondreele

Message:

fix a single crystal blunder

Location:

trunk

Files:

• GSASIIstrIO.py (modified) (1 diff)
• GSASIIstrMath.py (modified) (3 diffs)

trunk/GSASIIstrIO.py

@@ -307 +307 @@
 
     :param str GPXfile: full .gpx file name
-    :param str hNames: list of histogram names
+    :param str hType: list of histogram types
     :return: list of histogram names (types = PWDR & HKLF)
 

trunk/GSASIIstrMath.py

@@ -541 +541 @@
     Tdata,Mdata,Fdata,Xdata,dXdata,IAdata,Uisodata,Uijdata = GetAtomFXU(pfx,calcControls,parmDict)
     FF = np.zeros(len(Tdata))
-    if 'N' in parmDict[hfx+'Type']:
+    if 'N' in calcControls[hfx+'histType']:
         FP,FPP = G2el.BlenRes(Tdata,BLtables,parmDict[hfx+'Lam'])
     else:
@@ -555 +555 @@
         Bab = parmDict[phfx+'BabA']*np.exp(-parmDict[phfx+'BabU']*SQfactor)
         if not len(refl[-1]):                #no form factors
-            if 'N' in parmDict[hfx+'Type']:
+            if 'N' in calcControls[hfx+'histType']:
                 refl[-1] = G2el.getBLvalues(BLtables)
             else:       #'X'
@@ -593 +593 @@
     Tdata,Mdata,Fdata,Xdata,dXdata,IAdata,Uisodata,Uijdata = GetAtomFXU(pfx,calcControls,parmDict)
     FF = np.zeros(len(Tdata))
-    if 'N' in parmDict[hfx+'Type']:
+    if 'N' in calcControls[hfx+'histType']:
         FP = 0.
         FPP = 0.