Changeset 1121 for trunk/GSASII.py


Ignore:
Timestamp:
Oct 23, 2013 3:14:27 PM (9 years ago)
Author:
vondreele
Message:

reload binwin2.7 & binwin64-2.7 after fix to polymask.for
fix integration problem for polygon masks
now have 'frame' mask - outside of frame is excluded from integration

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1117 r1121  
    14091409        self.ifGetRing = False
    14101410        self.setPoly = False
     1411        self.setFrame = False
    14111412        arg = sys.argv
    14121413        if len(arg) > 1:
     
    15731574                        Data['range'] = [(Imin,Imax),[Imin,Imax]]
    15741575                        self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Image Controls'),Data)
    1575                         Masks = {'Points':[],'Rings':[],'Arcs':[],'Polygons':[],'Thresholds':[(Imin,Imax),[Imin,Imax]]}
     1576                        Masks = {'Points':[],'Rings':[],'Arcs':[],'Polygons':[],'Frames':[],'Thresholds':[(Imin,Imax),[Imin,Imax]]}
    15761577                        self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Masks'),Masks)
    15771578                        self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Stress/Strain'),
     
    19961997                        Data['range'] = [(Imin,Imax),[Imin,Imax]]
    19971998                        self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Image Controls'),Data)                                           
    1998                         Masks = {'Points':[],'Rings':[],'Arcs':[],'Polygons':[],'Thresholds':[(Imin,Imax),[Imin,Imax]]}
     1999                        Masks = {'Points':[],'Rings':[],'Arcs':[],'Polygons':[],'Frames':[],'Thresholds':[(Imin,Imax),[Imin,Imax]]}
    19992000                        self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Masks'),Masks)
    20002001                        self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Stress/Strain'),{})
Note: See TracChangeset for help on using the changeset viewer.