Changeset 346

Timestamp:

Aug 18, 2011 9:00:13 PM (12 years ago)

Author:

vondreele

Message:

GSASIIgrid.py - clear peaks from peak fit list & allow change from lam to lam1 & lam2
avoid log(neg) in image plots

Location:

trunk

Files:

• GSASIIgrid.py (modified) (3 diffs)
• GSASIIplot.py (modified) (2 diffs)

trunk/GSASIIgrid.py

@@ -40 +40 @@
 ] = [wx.NewId() for _init_coll_PAWLEY_Items in range(3)]
 
-[ wxID_INSTPRMRESET,
-] = [wx.NewId() for _init_coll_INST_Items in range(1)]
+[ wxID_INSTPRMRESET,wxID_CHANGEWAVETYPE,
+] = [wx.NewId() for _init_coll_INST_Items in range(2)]
 
 [ wxID_INDXRELOAD,
 ] = [wx.NewId() for _init_coll_IndPeaks_Items in range(1)]
 
-[ wxID_UNDO,wxID_LSQPEAKFIT,wxID_LSQONECYCLE,wxID_BFGSPEAKFIT,wxID_RESETSIGGAM,
+[ wxID_UNDO,wxID_LSQPEAKFIT,wxID_LSQONECYCLE,wxID_RESETSIGGAM,wxID_CLEARPEAKS,
 ] = [wx.NewId() for _init_coll_PEAK_Items in range(5)]
 
@@ -195 +195 @@
         parent.Append(help='Reset instrument profile parameters to default', 
             id=wxID_INSTPRMRESET, kind=wx.ITEM_NORMAL,text='Reset profile')
+        parent.Append(help='Change radiation type (Ka12 - synch)', 
+            id=wxID_CHANGEWAVETYPE, kind=wx.ITEM_NORMAL,text='Change radiation')
 
     def _init_coll_Peak_Items(self,parent):
@@ -203 +205 @@
         self.PFOneCycle = parent.Append(id=wxID_LSQONECYCLE, kind=wx.ITEM_NORMAL,text='LSQ one cycle', 
             help='One cycle of Peak fitting via least-squares' )
-#        self.PeakFit = parent.Append(id=wxID_BFGSPEAKFIT, kind=wx.ITEM_NORMAL,text='BFGS PeakFit', 
-#            help='Peak fitting via BFGS algorithm' )
         self.ResetSigGam = parent.Append(id=wxID_RESETSIGGAM, kind=wx.ITEM_NORMAL, 
             text='Reset sig and gam',help='Reset sigma and gamma to global fit' )
+        self.PeakFit = parent.Append(id=wxID_CLEARPEAKS, kind=wx.ITEM_NORMAL,text='Clear peaks', 
+            help='Clear the peak list' )
             
     def _init_coll_Index_Items(self,parent):

trunk/GSASIIplot.py

@@ -1644 +1644 @@
     try:
         if self.PatternTree.GetItemText(self.PickId) in ['Image Controls',]:
+            Choice = (' key press','l: log(I) on',)
             if self.logPlot:
-                Choice = (' key press','l: log(I) off')
-            else:
-                Choice = (' key press','l: log(I) on')
+                Choice[1] = 'l: log(I) off'
             cb = wx.ComboBox(self.G2plotNB.status,style=wx.CB_DROPDOWN|wx.CB_READONLY,
                 choices=Choice)
@@ -1692 +1691 @@
             AM = G2img.ImageCompress(MaskA,imScale)
             if self.logPlot:
-                A = np.log(A)
-                AM = np.log(AM)
+                A = np.where(A>0,np.log(A),0)
+                AM = np.where(AM>0,np.log(AM),0)
                 Imin,Imax = [np.amin(A),np.amax(A)]
             ImgM = Plot.imshow(AM,aspect='equal',cmap='Reds',