Changeset 230


Ignore:
Timestamp:
Jan 7, 2011 1:27:24 PM (11 years ago)
Author:
vondreele
Message:

add svn keywords & add log intensity plotting

Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/ElementTable.py

    • Property svn:keywords set to Date Author Revision URL Id
  • trunk/GSASII.BAT

    • Property svn:keywords set to Date Author Revision URL Id
    r156 r230  
    1 python c:\pyGSASII\GSASII.py %1
     1python d:\pyGSASII\GSASII.py %1
  • trunk/GSASII.py

    • Property svn:keywords set to Date Author Revision URL Id
  • trunk/GSASIIElem.py

    • Property svn:keywords set to Date Author Revision URL Id
    r166 r230  
    22   Copyright: 2008, Robert B. Von Dreele (Argonne National Laboratory)
    33"""
     4########### SVN repository information ###################
     5# $Date$
     6# $Author$
     7# $Revision$
     8# $URL$
     9# $Id$
     10########### SVN repository information ###################
    411
    512import wx
  • trunk/GSASIIIO.py

    • Property svn:keywords set to Date Author Revision URL Id
  • trunk/GSASIIgrid.py

    • Property svn:keywords set to Date Author Revision URL Id
    r225 r230  
    11#GSASII - data display routines
     2########### SVN repository information ###################
     3# $Date$
     4# $Author$
     5# $Revision$
     6# $URL$
     7# $Id$
     8########### SVN repository information ###################
    29import wx
    310import wx.grid as wg
  • trunk/GSASIIimage.py

    • Property svn:keywords set to Date Author Revision URL Id
    r167 r230  
    11#GSASII image calculations: ellipse fitting & image integration       
     2########### SVN repository information ###################
     3# $Date$
     4# $Author$
     5# $Revision$
     6# $URL$
     7# $Id$
     8########### SVN repository information ###################
    29import math
    310import wx
  • trunk/GSASIIimgGUI.py

    • Property svn:keywords set to Date Author Revision URL Id
    r193 r230  
    11#GSASII - image data display routines
     2########### SVN repository information ###################
     3# $Date$
     4# $Author$
     5# $Revision$
     6# $URL$
     7# $Id$
     8########### SVN repository information ###################
    29import wx
    310import wx.grid as wg
  • trunk/GSASIIindex.py

    • Property svn:keywords set to Date Author Revision URL Id
    r78 r230  
    11#GSASII cell indexing program: variation on that of A. Coehlo
    22#   includes cell refinement from peak positions (not zero as yet)
     3########### SVN repository information ###################
     4# $Date$
     5# $Author$
     6# $Revision$
     7# $URL$
     8# $Id$
     9########### SVN repository information ###################
    310import math
    411import wx
  • trunk/GSASIIlattice.py

    • Property svn:keywords set to Date Author Revision URL Id
    r193 r230  
    11'''Perform lattice-related computations'''
    22
     3########### SVN repository information ###################
     4# $Date$
     5# $Author$
     6# $Revision$
     7# $URL$
     8# $Id$
     9########### SVN repository information ###################
    310import math
    411import numpy as np
  • trunk/GSASIIpath.py

    • Property svn:keywords set to Date Author Revision URL Id
  • trunk/GSASIIpeak.py

    • Property svn:keywords set to Date Author Revision URL Id
    r196 r230  
    11#GSASII peak fitting module
     2########### SVN repository information ###################
     3# $Date$
     4# $Author$
     5# $Revision$
     6# $URL$
     7# $Id$
     8########### SVN repository information ###################
    29import sys
    310import math
  • trunk/GSASIIphsGUI.py

    • Property svn:keywords set to Date Author Revision URL Id
    r193 r230  
    11#GSASII - phase data display routines
     2########### SVN repository information ###################
     3# $Date$
     4# $Author$
     5# $Revision$
     6# $URL$
     7# $Id$
     8########### SVN repository information ###################
    29import wx
    310import wx.grid as wg
  • trunk/GSASIIplot.py

    • Property svn:keywords set to Date Author Revision URL Id
    r227 r230  
     1########### SVN repository information ###################
     2# $Date$
     3# $Author$
     4# $Revision$
     5# $URL$
     6# $Id$
     7########### SVN repository information ###################
    18import math
    29import time
     
    7582        sizer.Add(self.toolbar,0,wx.LEFT|wx.EXPAND)
    7683        self.SetSizer(sizer)
    77                
    78                
     84                             
    7985class G2PlotNoteBook(wx.Panel):
    8086    def __init__(self,parent,id=-1):
     
    320326                self.Weight = True
    321327            print 'plot weighting:',self.Weight
     328        elif event.key == 'l':
     329            if self.Contour:
     330                pass
     331            else:
     332                if self.logPlot:
     333                    self.logPlot = False
     334                else:
     335                    self.Offset = 0
     336                    self.logPlot = True
    322337        elif event.key == 'u':
    323338            if self.Contour:
    324339                self.Cmax = min(1.0,self.Cmax*1.2)
     340            elif self.logPlot:
     341                pass
    325342            elif self.Offset < 100.:
    326343                self.Offset += 1.
     
    328345            if self.Contour:
    329346                self.Cmax = max(0.0,self.Cmax*0.8)
     347            elif self.logPlot:
     348                pass
    330349            elif self.Offset > 0.:
    331350                self.Offset -= 1.
     
    458477            'i: interpolation method','s: color scheme','c: contour off')
    459478    else:
    460         Choice = (' key press','d: offset down','u: offset up','c: contour on',
    461             's: toggle single plot','+: no selection')
     479        if self.logPlot:
     480            Choice = (' key press','l: log(I) off',
     481                'c: contour on','s: toggle single plot','+: no selection')
     482        else:
     483            Choice = (' key press','d: offset down','u: offset up','l: log(I) on',
     484                'c: contour on','s: toggle single plot','+: no selection')
    462485    cb = wx.ComboBox(self.G2plotNB.status,style=wx.CB_DROPDOWN|wx.CB_READONLY,
    463486        choices=Choice)
     
    506529        X = xye[0]
    507530        if not lenX:
    508             lenX = len(X)
     531            lenX = len(X)           
    509532        Y = xye[1]+offset*N
    510533        if LimitId:
     
    528551                    W2 = np.sqrt(xye[2])
    529552                    D *= W2-Ymax*.02
    530                 Plot.plot(X,Y,colors[N%6]+'+',picker=3.,clip_on=False)
    531                 Plot.plot(X,Z,colors[(N+1)%6],picker=False)
    532                 Plot.plot(X,W,colors[(N+2)%6],picker=False)
    533                 Plot.plot(X,D,colors[(N+3)%6],picker=False)
    534                 Plot.axhline(0.,color=wx.BLACK)
     553                if self.logPlot:
     554                    Plot.semilogy(X,Y,colors[N%6]+'+',picker=3.,clip_on=False,nonposy='mask')
     555                    Plot.semilogy(X,Z,colors[(N+1)%6],picker=False,nonposy='mask')
     556                    Plot.semilogy(X,W,colors[(N+2)%6],picker=False,nonposy='mask')
     557                else:
     558                    Plot.plot(X,Y,colors[N%6]+'+',picker=3.,clip_on=False)
     559                    Plot.plot(X,Z,colors[(N+1)%6],picker=False)
     560                    Plot.plot(X,W,colors[(N+2)%6],picker=False)
     561                    Plot.plot(X,D,colors[(N+3)%6],picker=False)
     562                    Plot.axhline(0.,color=wx.BLACK)
    535563                Page.canvas.SetToolTipString('')
    536564                if self.PatternTree.GetItemText(PickId) == 'Peak List':
     
    545573                    data = self.LimitsTable.GetData()
    546574            else:
    547                 Plot.plot(X,Y,colors[N%6],picker=False)
     575                if self.logPlot:
     576                    Plot.semilogy(X,Y,colors[N%6],picker=False,nonposy='clip')
     577                else:
     578                    Plot.plot(X,Y,colors[N%6],picker=False)
    548579    if PickId and self.PatternTree.GetItemText(PickId) in ['Index Peak List','Unit Cells List']:
    549580        peaks = np.array((self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId, 'Index Peak List'))))
  • trunk/GSASIIpwdGUI.py

    • Property svn:keywords set to Date Author Revision URL Id
    r198 r230  
    11#GSASII - data display routines
     2########### SVN repository information ###################
     3# $Date$
     4# $Author$
     5# $Revision$
     6# $URL$
     7# $Id$
     8########### SVN repository information ###################
    29import wx
    310import wx.grid as wg
  • trunk/GSASIIsolve.py

    • Property svn:keywords set to Date Author Revision URL Id
    r192 r230  
    11#GSASIIsolve - structure solving routines
     2########### SVN repository information ###################
     3# $Date$
     4# $Author$
     5# $Revision$
     6# $URL$
     7# $Id$
     8########### SVN repository information ###################
    29import sys
    310import os.path as ospath
  • trunk/GSASIIspc.py

    • Property svn:keywords set to Date Author Revision URL Id
    r193 r230  
    11"GSASII - Space group interpretion routines"
    22
     3########### SVN repository information ###################
     4# $Date$
     5# $Author$
     6# $Revision$
     7# $URL$
     8# $Id$
     9########### SVN repository information ###################
    310import numpy as np
    411import numpy.ma as ma
  • trunk/GSASIIstruct.py

    • Property svn:keywords set to Date Author Revision URL Id
    r191 r230  
    11#GSASIIstructure - structure computation routines
     2########### SVN repository information ###################
     3# $Date$
     4# $Author$
     5# $Revision$
     6# $URL$
     7# $Id$
     8########### SVN repository information ###################
    29import sys
    310import os.path as ospath
  • trunk/unit_tests.py

    r102 r230  
     1########### SVN repository information ###################
     2# $Date$
     3# $Author$
     4# $Revision$
     5# $URL$
     6# $Id$
     7########### SVN repository information ###################
    18import GSASIIspc
    29import GSASIIlattice as G2l
Note: See TracChangeset for help on using the changeset viewer.