Changeset 281

Timestamp:

May 4, 2011 4:18:44 PM (11 years ago)

Author:

vondreele

Message:

implement reusable GSAS-II image files that can be read into a new project.
fix order of color schemes in contour plots
fix azimuth values from image integration
fix use of correct data structure for calculat all pdfs

Location:

trunk

Files:

• GSASII.py (modified) (4 diffs)
• GSASIIIO.py (modified) (5 diffs)
• GSASIIplot.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (3 diffs)

trunk/GSASII.py

@@ -422 +422 @@
         self.CheckNotebook()
         dlg = wx.FileDialog(self, 'Choose image files', '.', '',\
-        'Any image file (*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img)\
-        |*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img|\
+        'Any image file (*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img;*.G2img)\
+        |*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img;*.G2img|\
         Any detector tif (*.tif;*.tiff)|*.tif;*.tiff|\
         MAR file (*.mar*)|*.mar*|\
         GE Image (*.avg;*.sum)|*.avg;*.sum|\
         ADSC Image (*.img)|*.img|\
+        GSAS-II Image (*.G2img)|*.G2img|\
         All files (*.*)|*.*',
         wx.OPEN | wx.MULTIPLE)
@@ -602 +603 @@
                 name.SetEditable(False)
                 scale = wx.TextCtrl(panel,id,str(item[0]),style=wx.TE_PROCESS_ENTER)
-                scale.Bind(wx.EVT_TEXT,self.OnScaleChange)                    
+                scale.Bind(wx.EVT_TEXT_ENTER,self.OnScaleChange)
+                scale.Bind(wx.EVT_KILL_FOCUS,self.OnScaleChange)
                 dataGridSizer.Add(scale,0,wx.LEFT,10)
                 dataGridSizer.Add(name,0,wx.RIGHT,10)
@@ -608 +610 @@
                 wx.LEFT|wx.TOP|wx.ALIGN_CENTER_VERTICAL,10)
             self.name = wx.TextCtrl(panel,-1,self.data[-1],size=wx.Size(200,20),style=wx.TE_PROCESS_ENTER)
-            self.name.Bind(wx.EVT_TEXT,self.OnNameChange)
+            self.name.Bind(wx.EVT_TEXT_ENTER,self.OnNameChange)
+            self.name.Bind(wx.EVT_KILL_FOCUS,self.OnNameChange)
             dataGridSizer.Add(self.name,0,wx.RIGHT|wx.TOP,10)
             mainSizer.Add(dataGridSizer,0,wx.EXPAND)
@@ -825 +828 @@
                             self.dirname = dlg.GetDirectory()
                             newimagefile = dlg.GetPath()
-                            G2IO.PutG2Image(newimagefile,newImage)
+                            G2IO.PutG2Image(newimagefile,Comments,Data,Npix,newImage)
                             Imax = np.amax(newImage)
                             Imin = np.amin(newImage)

trunk/GSASIIIO.py

@@ -448 +448 @@
         Comments,Data,Npix,Image = GetGEsumData(imagefile)
     elif ext == '.G2img':
-        return GetG2Image(imagefile)
+        Comments,Data,Npix,Image = GetG2Image(imagefile)
     if imageOnly:
         return Image
@@ -454 +454 @@
         return Comments,Data,Npix,Image
         
-def PutG2Image(filename,image):
+def PutG2Image(filename,Comments,Data,Npix,image):
     File = open(filename,'wb')
-    cPickle.dump(image,File,1)
+    cPickle.dump([Comments,Data,Npix,image],File,1)
     File.close()
     return
@@ -462 +462 @@
 def GetG2Image(filename):
     File = open(filename,'rb')
-    image = cPickle.load(File)
+    Comments,Data,Npix,image = cPickle.load(File)
     File.close()
-    return image
+    return Comments,Data,Npix,image
     
 def GetGEsumData(filename,imageOnly=False):
@@ -783 +783 @@
         
 def SaveIntegration(self,PickId,data):
-    azms = self.Integrate[1]
+    azms = self.Integrate[1][:-1]
     X = self.Integrate[2][:-1]
     Xminmax = [X[0],X[-1]]
@@ -793 +793 @@
     names = ['Type','Lam','Zero','Polariz.','U','V','W','X','Y','SH/L','Azimuth'] 
     codes = [0 for i in range(11)]
-    Azms = [(azms[i+1]+azms[i])/2. for i in range(len(azms)-1)]
+    LRazm = data['LRazimuth']
     if data['fullIntegrate'] and data['outAzimuths'] == 1:
-        Azms = [0.0,]
-    for i,azm in enumerate(Azms):
+        Azms = [45.0,]                              #a poor man's average?
+    for i,azm in enumerate(azms):
         item, cookie = self.PatternTree.GetFirstChild(self.root)
         Id = 0

trunk/GSASIIplot.py

@@ -384 +384 @@
             if self.Contour:
                 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]
+                choice.sort()
                 dlg = wx.SingleChoiceDialog(self,'Select','Color scheme',choice)
                 if dlg.ShowModal() == wx.ID_OK:
@@ -717 +718 @@
             if self.Contour:
                 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]
+                choice.sort()
                 dlg = wx.SingleChoiceDialog(self,'Select','Color scheme',choice)
                 if dlg.ShowModal() == wx.ID_OK:

trunk/GSASIIpwdGUI.py

@@ -1417 +1417 @@
         inst = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,powId,'Instrument Parameters'))
         inst = dict(zip(inst[3],inst[1]))
-        auxPlot = G2pwd.CalcPDF(data,inst,xydata)
+        auxPlot = G2pwd.CalcPDF(Data,inst,xydata)
         PDFId = G2gd.GetPatternTreeItemId(self,self.root,'PDF '+powName[4:])
         self.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(self,PDFId,'I(Q)'+powName[4:]),xydata['IofQ'])
@@ -1428 +1428 @@
         print 'Calculating PDF:'
         auxPlot = ComputePDF(data)
+        print 'Done calculating PDF:'
         Status.SetStatusText('PDF computed')
         for plot in auxPlot:
@@ -1449 +1450 @@
             Status.SetStatusText('All PDFs computed')
             G2plt.PlotISFG(self,newPlot=True,type='G(R)')
+            print ' Done calculating PDFs:'
         
     def OnShowTip(self,tip):