Changeset 701 for trunk/GSASIIimage.py


Ignore:
Timestamp:
Aug 9, 2012 10:09:04 AM (9 years ago)
Author:
vondreele
Message:

change Hessian progress bar dialog
fix crash in General cell & isotope editing
avoid error in reflection list

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r700 r701  
    761761        Ring = np.array(Ring).T
    762762        ring['ImxyObs'] = np.array(Ring[:2])      #need to apply masks to this to eliminate bad points
    763         [x,y] = np.array(makeIdealRing(ellipse)).T
    764         if len(x):
    765             Tth,azm = GetTthAzm(x,y,StaControls)
    766             azm += Controls['azmthOff']     #account for detector rotation
    767             th = Tth/2.
    768             th += 180.*np.sum(StrSta['strain']*calcFij(StrSta['Sample phi'],0.,azm,th))/(np.pi*1.e6) #in degrees
    769             Tth = th*2.
    770763       
    771764
     
    808801        print sigstr
    809802       
    810     def strainCalc(E,xyd,wave):
    811         x,y,dsp = xyd
    812         tth = 2.0*npasind(wave/(2.*dsp))
    813        
     803    def strainCalc(E,xyd,wave,phi):
     804        th,azm,dsp = xyd
     805        th0 = npasind(wave/(2.*dsp))
     806        dth = 180.*np.sum(StrSta['strain']*calcFij(phi,0.,azm,th))/(np.pi*1.e6) #in degrees
     807       
Note: See TracChangeset for help on using the changeset viewer.