Ignore:
Timestamp:
Oct 9, 2015 2:57:18 PM (6 years ago)
Author:
vondreele
Message:

fix Fade problem
ModulationDeriv? work
twin sf error fixed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIstrMath.py

    r1993 r1996  
    754754        else:
    755755            if len(TwinLaw) > 1:
    756                 refl.T[9] = np.sum(fas[:,:,0]**2,axis=0)+np.sum(fbs[:,:,0]**2,axis=0)   #FcT from primary twin element
     756                refl.T[9] = np.sum(fas[:,:,0],axis=0)**2+np.sum(fbs[:,:,0],axis=0)**2   #FcT from primary twin element
    757757                refl.T[7] = np.sum(TwinFr*np.sum(TwMask[np.newaxis,:,:]*fas,axis=0)**2,axis=-1)+   \
    758758                    np.sum(TwinFr*np.sum(TwMask[np.newaxis,:,:]*fbs,axis=0)**2,axis=-1)                        #Fc sum over twins
     
    10671067        fag = fa*GfpuA[0]-fb*GfpuA[1]
    10681068        fbg = fb*GfpuA[0]+fa*GfpuA[1]
    1069 #        GSASIIpath.IPyBreak()
    10701069        fas = np.sum(np.sum(fag,axis=-1),axis=-1)
    10711070        fbs = np.sum(np.sum(fbg,axis=-1),axis=-1)
     1071#        GSASIIpath.IPyBreak()
    10721072        if 'P' in calcControls[hfx+'histType']:
    10731073            refl.T[10] = np.sum(fas**2,axis=0)+np.sum(fbs**2,axis=0)
     
    10751075        else:
    10761076            if len(TwinLaw) > 1:
    1077                 refl.T[10] = np.sum(fas[:,:,0]**2,axis=0)+np.sum(fbs[:,:,0]**2,axis=0)   #FcT from primary twin element
     1077                refl.T[10] = np.sum(fas[:,:,0],axis=0)**2+np.sum(fbs[:,:,0],axis=0)**2   #FcT from primary twin element
    10781078                refl.T[8] = np.sum(TwinFr*np.sum(TwMask[np.newaxis,:,:]*fas,axis=0)**2,axis=-1)+   \
    10791079                    np.sum(TwinFr*np.sum(TwMask[np.newaxis,:,:]*fbs,axis=0)**2,axis=-1)                        #Fc sum over twins
Note: See TracChangeset for help on using the changeset viewer.