Changeset 281 for trunk/GSASIIIO.py

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

File:

• trunk/GSASIIIO.py (modified) (5 diffs)

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