Changeset 644


Ignore:
Timestamp:
May 30, 2012 4:29:07 PM (9 years ago)
Author:
vondreele
Message:

fix map plotting error
working on findOffset

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIImath.py

    r620 r644  
    604604        F = Flist[i]
    605605        hkl = np.unravel_index(Fdict[F],hklShape)
    606         iabsnt,mulp,Uniq,phi = G2spc.GenHKLf(list(hkl-hklHalf),SGData)
     606        iabsnt,mulp,Uniq,phi = G2spc.GenHKLf(list(hkl-hklHalf),SGData,Friedel=True)
    607607        Uniq = np.array(Uniq,dtype='i')+hklHalf
    608608        print hkl-hklHalf
     
    612612            Fh = Fhkl[H[0],H[1],H[2]]
    613613            h,k,l = H-hklHalf
    614             ang = np.angle(Fh,deg=True)/360.-ph0
    615             print '(%3d,%3d,%3d) %5.2f %9.5f %9.5f'%(h,k,l,phi[j],np.angle(Fh,deg=True)/360.,ang)       
     614            ang = np.angle(Fh,deg=True)/360.-phi[j]
     615            print '(%3d,%3d,%3d) %9.5f'%(h,k,l,ang)       
    616616        i += 1
    617617       
  • trunk/GSASIIplot.py

    r636 r644  
    28232823                rho = ma.array(mapData['rho'],mask=(mapData['rho']<contLevel))
    28242824            steps = 1./np.array(rho.shape)
    2825             incre = np.where(VP>0,VP%steps,VP%steps-steps)
     2825            incre = np.where(VP>=0,VP%steps,VP%steps-steps)
    28262826            Vsteps = -np.array(VP/steps,dtype='i')
    28272827            rho = np.roll(np.roll(np.roll(rho,Vsteps[0],axis=0),Vsteps[1],axis=1),Vsteps[2],axis=2)
     
    28642864        glLoadIdentity()
    28652865        glRotate(anglez,0,0,1)
     2866        glRotate(angley,sind(anglez),cosd(anglez),0)
    28662867        glRotate(anglex,cosd(anglez),-sind(anglez),0)
    2867         glRotate(angley,sind(anglez),cosd(anglez),0)
    28682868        glMultMatrixf(A4mat.T)
    28692869        glTranslate(-Tx,-Ty,-Tz)
Note: See TracChangeset for help on using the changeset viewer.