Changeset 3949


Ignore:
Timestamp:
May 3, 2019 9:21:07 AM (2 years ago)
Author:
vondreele
Message:

suppress green dot density plotting for 4D maps - they aren't correct because of tau gradient issue. No "fix" possible.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIphsGUI.py

    r3933 r3949  
    62146214                slideSizer.Add(magMult,1,wx.EXPAND|wx.RIGHT)
    62156215           
    6216             if generalData['Map']['rhoMax']:
     6216            if generalData['Map']['rhoMax'] and not generalData.get('4DmapData',{}):
    62176217                contourLevelTxt = wx.StaticText(drawOptions,-1,' Rho maximum: '+'%.2f'%(drawingData['contourLevel']*generalData['Map']['rhoMax']))
    62186218                slideSizer.Add(contourLevelTxt,0,WACV)
  • trunk/GSASIIplot.py

    r3946 r3949  
    78767876            drawingData['viewPoint'] = [np.array([Tx,Ty,Tz]),pI]
    78777877            SetViewPointText(drawingData['viewPoint'][0])           
    7878             G2frame.G2plotNB.status.SetStatusText('View point at atom '+drawAtoms[pI[0]][ct-1]+str(pI),1)
     7878            G2frame.G2plotNB.status.SetStatusText('View point at atom '+drawAtoms[pI[0]][ct-1]+str(pI)+str(indx),1)
    78797879        elif key in ['U','D','L','R'] and mapData['Flip'] == True:
    78807880            dirDict = {'U':[0,1],'D':[0,-1],'L':[-1,0],'R':[1,0]}
     
    86668666        rhoXYZ = []
    86678667        rho = []
     8668        FourD = False
    86688669        if len(D4mapData.get('rho',[])):        #preferentially select 4D map if there
    8669             rho = D4mapData['rho'][:,:,:,int(G2frame.tau*10)]   #pick current tau 3D slice
     8670            FourD = True
     8671#            rho = D4mapData['rho'][:,:,:,int(G2frame.tau*10)]   #pick current tau 3D slice
    86708672        elif len(mapData['rho']):               #ordinary 3D map
    86718673            rho = mapData['rho']
     
    88038805                radius = 0.1
    88048806                RenderLines(x,y,z,Bonds,bndColor)
    8805 #                RenderBonds(x,y,z,Bonds,0.05,color,6)
    88068807            elif atom[cs] == 'sticks':
    88078808                radius = 0.1
     
    88398840                RenderLabel(x,y,z,'  '+atom[ct-2],radius,wxGreen,matRot)
    88408841#        glDisable(GL_BLEND)
    8841         if len(rhoXYZ):
     8842        if not FourD and len(rhoXYZ):       #no green dot map for 4D - it's wrong!
    88428843            RenderMap(rho,rhoXYZ,indx,Rok)
    88438844        if len(mapPeaks):
     
    88848885                    RenderPlane(plane,color)
    88858886        if drawingData.get('showSlice',False):
    8886             FourD = False
    88878887            if len(D4mapData.get('rho',[])):        #preferentially select 4D map if there
    8888                 FourD = True
    88898888                modQ = np.array(generalData['SuperVec'][0])
    8890                 rho4D = D4mapData['rho']
     8889                rho = D4mapData['rho']
    88918890            elif len(mapData['rho']):               #ordinary 3D map
    88928891                rho = mapData['rho']
     
    89078906            if FourD:
    89088907                SXYZT = np.vstack((SXYZ.T,np.inner(SXYZ,modQ)+G2frame.tau)).T
    8909                 Z = np.reshape(map_coordinates(rho4D,(SXYZT%1.*rho4D.shape).T,order=1,mode='wrap'),(npts,npts))
     8908                Z = np.reshape(map_coordinates(rho,(SXYZT%1.*rho.shape).T,order=1,mode='wrap'),(npts,npts))
    89108909            else:
    89118910                Z = np.reshape(map_coordinates(rho,(SXYZ%1.*rho.shape).T,order=1,mode='wrap'),(npts,npts))
Note: See TracChangeset for help on using the changeset viewer.