Changeset 251
- Timestamp:
- Mar 1, 2011 1:16:27 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIIO.py
r249 r251 695 695 print 'Read APS PE-detector tiff file: ',filename 696 696 if dataType == 5: 697 image = np.array(ar.array('f',File.read(4*Npix)),dtype=np. int32)697 image = np.array(ar.array('f',File.read(4*Npix)),dtype=np.float32) 698 698 else: 699 699 image = np.array(ar.array('I',File.read(4*Npix)),dtype=np.int32) -
trunk/GSASIIimage.py
r248 r251 504 504 tam = ma.make_mask_none((iLim[1]-iLim[0],jLim[1]-jLim[0])) 505 505 for polygon in polygons: 506 tamp = ma.make_mask_none((nI*nJ)) 507 tam = ma.mask_or(tam.flatten(),ma.make_mask(pm.polymask(nI*nJ, 508 tax.flatten(),tay.flatten(),len(polygon),polygon,tamp))) 506 if polygon: 507 tamp = ma.make_mask_none((nI*nJ)) 508 tam = ma.mask_or(tam.flatten(),ma.make_mask(pm.polymask(nI*nJ, 509 tax.flatten(),tay.flatten(),len(polygon),polygon,tamp))) 509 510 if tam.shape: tam = np.reshape(tam,(nI,nJ)) 510 511 for X,Y,diam in spots: -
trunk/GSASIIimgGUI.py
r248 r251 302 302 Data['rings'] = [] 303 303 Data['ellipses'] = [] 304 self.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(self,id, 'Image Controls'), Data)304 self.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(self,id, 'Image Controls'),copy.deepcopy(Data)) 305 305 finally: 306 306 dlg.Destroy() … … 316 316 File = open(filename,'w') 317 317 save = {} 318 keys = ['type','wavelength','calibrant','distance','center','tilt','rotation' ]318 keys = ['type','wavelength','calibrant','distance','center','tilt','rotation','azmthOff'] 319 319 for key in keys: 320 320 File.write(key+':'+str(data[key])+'\n') … … 662 662 663 663 def OnCopyMask(event): 664 import copy 664 665 TextList = [] 665 666 Names = [] … … 672 673 if id == self.Image: 673 674 Source = name 674 mask = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,id, 'Masks')) 675 Mask = copy.copy(self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,id, 'Masks'))) 676 del Mask['Thresholds'] 675 677 else: 676 678 TextList.append([False,name,id]) … … 685 687 for i,item in enumerate(result): 686 688 ifcopy,name,id = item 687 if ifcopy: 689 if ifcopy: 690 mask = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,id, 'Masks')) 691 mask.update(Mask) 688 692 self.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(self,id, 'Masks'),mask) 689 693 finally: -
trunk/ImageCalibrants.py
r245 r251 13 13 'Ni @ 298K':(0,(3.52475,3.52475,3.52475,90,90,90),0,(0.5,20,10)), 14 14 'NaCl @ 298K':(0,(5.6402,5.6402,5.6402,90,90,90),0,(0.5,20,10)), 15 'NaCl even hkl only':(2,(2.8201,2.8201,2.8201,90,90,90),0,(0.5,20,10)), 15 16 'Ag behenate':(6,(1.0,1.0,58.380,90,90,90),0,(7.0,5,1)), 16 17 'Spun Si grating':(6,(1.0,1.0,2777.78,90,90,90),2,(200.,5,1))
Note: See TracChangeset
for help on using the changeset viewer.