Changeset 251

Timestamp:

Mar 1, 2011 1:16:27 PM (12 years ago)

Author:

vondreele

Message:

Add NaCl? even hkl to ImageCalibrants?.py
Fix bug in polygon mask in GSASIIimage.py
Fix copy bugs in GSASIIimgGUI.py
Make float image for float tiff file in GSASIIIO.py

Location:

trunk

Files:

• GSASIIIO.py (modified) (1 diff)
• GSASIIimage.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (5 diffs)
• ImageCalibrants.py (modified) (1 diff)

trunk/GSASIIIO.py

@@ -695 +695 @@
                     print 'Read APS PE-detector tiff file: ',filename
                 if dataType == 5:
-                    image = np.array(ar.array('f',File.read(4*Npix)),dtype=np.int32)
+                    image = np.array(ar.array('f',File.read(4*Npix)),dtype=np.float32)
                 else:
                     image = np.array(ar.array('I',File.read(4*Npix)),dtype=np.int32)

trunk/GSASIIimage.py

@@ -504 +504 @@
     tam = ma.make_mask_none((iLim[1]-iLim[0],jLim[1]-jLim[0]))
     for polygon in polygons:
-        tamp = ma.make_mask_none((nI*nJ))
-        tam = ma.mask_or(tam.flatten(),ma.make_mask(pm.polymask(nI*nJ,
-            tax.flatten(),tay.flatten(),len(polygon),polygon,tamp)))
+        if polygon:
+            tamp = ma.make_mask_none((nI*nJ))
+            tam = ma.mask_or(tam.flatten(),ma.make_mask(pm.polymask(nI*nJ,
+                tax.flatten(),tay.flatten(),len(polygon),polygon,tamp)))
     if tam.shape: tam = np.reshape(tam,(nI,nJ))
     for X,Y,diam in spots:

trunk/GSASIIimgGUI.py

@@ -302 +302 @@
                             Data['rings'] = []
                             Data['ellipses'] = []
-                            self.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(self,id, 'Image Controls'),Data)
+                            self.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(self,id, 'Image Controls'),copy.deepcopy(Data))
             finally:
                 dlg.Destroy()
@@ -316 +316 @@
                 File = open(filename,'w')
                 save = {}
-                keys = ['type','wavelength','calibrant','distance','center','tilt','rotation']
+                keys = ['type','wavelength','calibrant','distance','center','tilt','rotation','azmthOff']
                 for key in keys:
                     File.write(key+':'+str(data[key])+'\n')
@@ -662 +662 @@
 
     def OnCopyMask(event):
+        import copy
         TextList = []
         Names = []
@@ -672 +673 @@
                     if id == self.Image:
                         Source = name
-                        mask = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,id, 'Masks'))
+                        Mask = copy.copy(self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,id, 'Masks')))
+                        del Mask['Thresholds']
                     else:
                         TextList.append([False,name,id])
@@ -685 +687 @@
                     for i,item in enumerate(result):
                         ifcopy,name,id = item
-                        if ifcopy:                                
+                        if ifcopy:
+                            mask = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,id, 'Masks'))
+                            mask.update(Mask)                                
                             self.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(self,id, 'Masks'),mask)
             finally:

trunk/ImageCalibrants.py

@@ -13 +13 @@
 'Ni   @ 298K':(0,(3.52475,3.52475,3.52475,90,90,90),0,(0.5,20,10)),
 'NaCl @ 298K':(0,(5.6402,5.6402,5.6402,90,90,90),0,(0.5,20,10)),
+'NaCl even hkl only':(2,(2.8201,2.8201,2.8201,90,90,90),0,(0.5,20,10)),
 'Ag behenate':(6,(1.0,1.0,58.380,90,90,90),0,(7.0,5,1)),
 'Spun Si grating':(6,(1.0,1.0,2777.78,90,90,90),2,(200.,5,1))