Changeset 1140


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIstrMath.py

    r1136 r1140  
    642642            dat = G2el.getBLvalues(BLtables)
    643643            refDict['FF']['El'] = dat.keys()
    644             refDict['FF']['FF'] = np.ones((len(refl),len(dat)))*dat.values()           
     644            refDict['FF']['FF'] = np.ones((nRef,len(dat)))*dat.values()           
    645645        else:       #'X'
    646646            dat = G2el.getFFvalues(FFtables,0.)
    647647            refDict['FF']['El'] = dat.keys()
    648             refDict['FF']['FF'] = np.ones((len(refDict['RefList']),len(dat)))
     648            refDict['FF']['FF'] = np.ones((nRef,len(dat)))
    649649            for iref,ref in enumerate(refDict['RefList']):
    650650                SQ = 1./(2.*ref[4])**2
  • trunk/ImageCalibrants.py

    r1137 r1140  
    3434"""
    3535Calibrants={
    36 'None':([0,],[(0,0,0,0,0,0),],0,(1.0,10,10)),
     36'':([0,],[(0,0,0,0,0,0),],0,(1.0,10,10)),
    3737'LaB6  SRM660a':([2,],[(4.1569162,4.1569162,4.1569162,90,90,90),],0,(1.0,10,10)),
    3838'LaB6  SRM660a skip 1':([2,],[(4.1569162,4.1569162,4.1569162,90,90,90),],1,(1.0,10,10)),
Note: See TracChangeset for help on using the changeset viewer.