Changeset 230

Timestamp:

Jan 7, 2011 1:27:24 PM (13 years ago)

Author:

vondreele

Message:

add svn keywords & add log intensity plotting

Location:

trunk

Files:

• ElementTable.py (modified) (1 prop)
• GSASII.BAT (modified) (1 diff, 1 prop)
• GSASII.py (modified) (1 prop)
• GSASIIElem.py (modified) (1 diff, 1 prop)
• GSASIIIO.py (modified) (1 prop)
• GSASIIgrid.py (modified) (1 diff, 1 prop)
• GSASIIimage.py (modified) (1 diff, 1 prop)
• GSASIIimgGUI.py (modified) (1 diff, 1 prop)
• GSASIIindex.py (modified) (1 diff, 1 prop)
• GSASIIlattice.py (modified) (1 diff, 1 prop)
• GSASIIpath.py (modified) (1 prop)
• GSASIIpeak.py (modified) (1 diff, 1 prop)
• GSASIIphsGUI.py (modified) (1 diff, 1 prop)
• GSASIIplot.py (modified) (8 diffs, 1 prop)
• GSASIIpwdGUI.py (modified) (1 diff, 1 prop)
• GSASIIsolve.py (modified) (1 diff, 1 prop)
• GSASIIspc.py (modified) (1 diff, 1 prop)
• GSASIIstruct.py (modified) (1 diff, 1 prop)
• unit_tests.py (modified) (1 diff)

trunk/GSASII.BAT

@@ -1 @@
-python c:\pyGSASII\GSASII.py %1
+python d:\pyGSASII\GSASII.py %1

trunk/GSASIIElem.py

@@ -2 +2 @@
    Copyright: 2008, Robert B. Von Dreele (Argonne National Laboratory)
 """
+########### SVN repository information ###################
+# $Date$
+# $Author$
+# $Revision$
+# $URL$
+# $Id$
+########### SVN repository information ###################
 
 import wx

trunk/GSASIIgrid.py

@@ -1 +1 @@
 #GSASII - data display routines
+########### SVN repository information ###################
+# $Date$
+# $Author$
+# $Revision$
+# $URL$
+# $Id$
+########### SVN repository information ###################
 import wx
 import wx.grid as wg

trunk/GSASIIimage.py

@@ -1 +1 @@
 #GSASII image calculations: ellipse fitting & image integration        
+########### SVN repository information ###################
+# $Date$
+# $Author$
+# $Revision$
+# $URL$
+# $Id$
+########### SVN repository information ###################
 import math
 import wx

trunk/GSASIIimgGUI.py

@@ -1 +1 @@
 #GSASII - image data display routines
+########### SVN repository information ###################
+# $Date$
+# $Author$
+# $Revision$
+# $URL$
+# $Id$
+########### SVN repository information ###################
 import wx
 import wx.grid as wg

trunk/GSASIIindex.py

@@ -1 +1 @@
 #GSASII cell indexing program: variation on that of A. Coehlo
 #   includes cell refinement from peak positions (not zero as yet)
+########### SVN repository information ###################
+# $Date$
+# $Author$
+# $Revision$
+# $URL$
+# $Id$
+########### SVN repository information ###################
 import math
 import wx

trunk/GSASIIlattice.py

@@ -1 +1 @@
 '''Perform lattice-related computations'''
 
+########### SVN repository information ###################
+# $Date$
+# $Author$
+# $Revision$
+# $URL$
+# $Id$
+########### SVN repository information ###################
 import math
 import numpy as np

trunk/GSASIIpeak.py

@@ -1 +1 @@
 #GSASII peak fitting module
+########### SVN repository information ###################
+# $Date$
+# $Author$
+# $Revision$
+# $URL$
+# $Id$
+########### SVN repository information ###################
 import sys
 import math

trunk/GSASIIphsGUI.py

@@ -1 +1 @@
 #GSASII - phase data display routines
+########### SVN repository information ###################
+# $Date$
+# $Author$
+# $Revision$
+# $URL$
+# $Id$
+########### SVN repository information ###################
 import wx
 import wx.grid as wg

trunk/GSASIIplot.py

@@ +1 @@
+########### SVN repository information ###################
+# $Date$
+# $Author$
+# $Revision$
+# $URL$
+# $Id$
+########### SVN repository information ###################
 import math
 import time
@@ -75 +82 @@
         sizer.Add(self.toolbar,0,wx.LEFT|wx.EXPAND)
         self.SetSizer(sizer)
-               
-                
+                              
 class G2PlotNoteBook(wx.Panel):
     def __init__(self,parent,id=-1):
@@ -320 +326 @@
                 self.Weight = True
             print 'plot weighting:',self.Weight
+        elif event.key == 'l':
+            if self.Contour:
+                pass
+            else:
+                if self.logPlot:
+                    self.logPlot = False
+                else:
+                    self.Offset = 0
+                    self.logPlot = True
         elif event.key == 'u':
             if self.Contour:
                 self.Cmax = min(1.0,self.Cmax*1.2)
+            elif self.logPlot:
+                pass
             elif self.Offset < 100.:
                 self.Offset += 1.
@@ -328 +345 @@
             if self.Contour:
                 self.Cmax = max(0.0,self.Cmax*0.8)
+            elif self.logPlot:
+                pass
             elif self.Offset > 0.:
                 self.Offset -= 1.
@@ -458 +477 @@
             'i: interpolation method','s: color scheme','c: contour off')
     else:
-        Choice = (' key press','d: offset down','u: offset up','c: contour on',
-            's: toggle single plot','+: no selection')
+        if self.logPlot:
+            Choice = (' key press','l: log(I) off',
+                'c: contour on','s: toggle single plot','+: no selection')
+        else:
+            Choice = (' key press','d: offset down','u: offset up','l: log(I) on',
+                'c: contour on','s: toggle single plot','+: no selection')
     cb = wx.ComboBox(self.G2plotNB.status,style=wx.CB_DROPDOWN|wx.CB_READONLY,
         choices=Choice)
@@ -506 +529 @@
         X = xye[0]
         if not lenX:
-            lenX = len(X)
+            lenX = len(X)           
         Y = xye[1]+offset*N
         if LimitId:
@@ -528 +551 @@
                     W2 = np.sqrt(xye[2])
                     D *= W2-Ymax*.02
-                Plot.plot(X,Y,colors[N%6]+'+',picker=3.,clip_on=False)
-                Plot.plot(X,Z,colors[(N+1)%6],picker=False)
-                Plot.plot(X,W,colors[(N+2)%6],picker=False)
-                Plot.plot(X,D,colors[(N+3)%6],picker=False)
-                Plot.axhline(0.,color=wx.BLACK)
+                if self.logPlot:
+                    Plot.semilogy(X,Y,colors[N%6]+'+',picker=3.,clip_on=False,nonposy='mask')
+                    Plot.semilogy(X,Z,colors[(N+1)%6],picker=False,nonposy='mask')
+                    Plot.semilogy(X,W,colors[(N+2)%6],picker=False,nonposy='mask')
+                else:
+                    Plot.plot(X,Y,colors[N%6]+'+',picker=3.,clip_on=False)
+                    Plot.plot(X,Z,colors[(N+1)%6],picker=False)
+                    Plot.plot(X,W,colors[(N+2)%6],picker=False)
+                    Plot.plot(X,D,colors[(N+3)%6],picker=False)
+                    Plot.axhline(0.,color=wx.BLACK)
                 Page.canvas.SetToolTipString('')
                 if self.PatternTree.GetItemText(PickId) == 'Peak List':
@@ -545 +573 @@
                     data = self.LimitsTable.GetData()
             else:
-                Plot.plot(X,Y,colors[N%6],picker=False)
+                if self.logPlot:
+                    Plot.semilogy(X,Y,colors[N%6],picker=False,nonposy='clip')
+                else:
+                    Plot.plot(X,Y,colors[N%6],picker=False)
     if PickId and self.PatternTree.GetItemText(PickId) in ['Index Peak List','Unit Cells List']:
         peaks = np.array((self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId, 'Index Peak List'))))

trunk/GSASIIpwdGUI.py

@@ -1 +1 @@
 #GSASII - data display routines
+########### SVN repository information ###################
+# $Date$
+# $Author$
+# $Revision$
+# $URL$
+# $Id$
+########### SVN repository information ###################
 import wx
 import wx.grid as wg

trunk/GSASIIsolve.py

@@ -1 +1 @@
 #GSASIIsolve - structure solving routines
+########### SVN repository information ###################
+# $Date$
+# $Author$
+# $Revision$
+# $URL$
+# $Id$
+########### SVN repository information ###################
 import sys
 import os.path as ospath

trunk/GSASIIspc.py

@@ -1 +1 @@
 "GSASII - Space group interpretion routines"
 
+########### SVN repository information ###################
+# $Date$
+# $Author$
+# $Revision$
+# $URL$
+# $Id$
+########### SVN repository information ###################
 import numpy as np
 import numpy.ma as ma

trunk/GSASIIstruct.py

@@ -1 +1 @@
 #GSASIIstructure - structure computation routines
+########### SVN repository information ###################
+# $Date$
+# $Author$
+# $Revision$
+# $URL$
+# $Id$
+########### SVN repository information ###################
 import sys
 import os.path as ospath

trunk/unit_tests.py

@@ +1 @@
+########### SVN repository information ###################
+# $Date$
+# $Author$
+# $Revision$
+# $URL$
+# $Id$
+########### SVN repository information ###################
 import GSASIIspc
 import GSASIIlattice as G2l