Changeset 1140

Timestamp:

Nov 7, 2013 12:47:17 PM (8 years ago)

Author:

vondreele

Message:

fix problem in lease squares
fix ImageCalibrants?.py - remove None

Location:

trunk

Files:

• GSASIIstrMath.py (modified) (1 diff)
• ImageCalibrants.py (modified) (1 diff)

trunk/GSASIIstrMath.py

@@ -642 +642 @@
             dat = G2el.getBLvalues(BLtables)
             refDict['FF']['El'] = dat.keys()
-            refDict['FF']['FF'] = np.ones((len(refl),len(dat)))*dat.values()            
+            refDict['FF']['FF'] = np.ones((nRef,len(dat)))*dat.values()            
         else:       #'X'
             dat = G2el.getFFvalues(FFtables,0.)
             refDict['FF']['El'] = dat.keys()
-            refDict['FF']['FF'] = np.ones((len(refDict['RefList']),len(dat)))
+            refDict['FF']['FF'] = np.ones((nRef,len(dat)))
             for iref,ref in enumerate(refDict['RefList']):
                 SQ = 1./(2.*ref[4])**2

trunk/ImageCalibrants.py

@@ -34 +34 @@
 """
 Calibrants={
-'None':([0,],[(0,0,0,0,0,0),],0,(1.0,10,10)),
+'':([0,],[(0,0,0,0,0,0),],0,(1.0,10,10)),
 'LaB6  SRM660a':([2,],[(4.1569162,4.1569162,4.1569162,90,90,90),],0,(1.0,10,10)),
 'LaB6  SRM660a skip 1':([2,],[(4.1569162,4.1569162,4.1569162,90,90,90),],1,(1.0,10,10)),