Changeset 4317


Ignore:
Timestamp:
Feb 17, 2020 10:05:27 AM (20 months ago)
Author:
vondreele
Message:

make esd multiplier for spot mask search a float
add timing to it

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r4301 r4317  
    361361    Masks = {'Points':[],'Rings':[],'Arcs':[],'Polygons':[],'Frames':[],
    362362                 'Thresholds':[(0,Imax),[0,Imax]],
    363                  'SpotMask':{'esdMul':2,'spotMask':None}}
     363                 'SpotMask':{'esdMul':2.,'spotMask':None}}
    364364    G2frame.GPXtree.SetItemPyData(G2frame.GPXtree.AppendItem(Id,text='Masks'),Masks)
    365365    G2frame.GPXtree.SetItemPyData(G2frame.GPXtree.AppendItem(Id,text='Stress/Strain'),
  • trunk/GSASIIdataGUI.py

    r4314 r4317  
    36153615                        Masks = {'Points':[],'Rings':[],'Arcs':[],'Polygons':[],
    36163616                            'Frames':[],'Thresholds':[(Imin,Imax),[Imin,Imax]],
    3617                                      'SpotMask':{'esdMul':2,'spotMask':None}}
     3617                                     'SpotMask':{'esdMul':2.,'spotMask':None}}
    36183618                        self.GPXtree.SetItemPyData(self.GPXtree.AppendItem(Id,text='Masks'),Masks)
    36193619                        self.GPXtree.SetItemPyData(self.GPXtree.AppendItem(Id,text='Stress/Strain'),
  • trunk/GSASIIimgGUI.py

    r4303 r4317  
    16391639            if dlg.ShowModal() == wx.ID_OK:
    16401640                filename = dlg.GetPath()
     1641               
    16411642                G2fil.readMasks(filename,data,ignoreThreshold)
    16421643                wx.CallAfter(UpdateMasks,G2frame,data)
     
    16601661            dlg = wx.ProgressDialog("Auto spot masking for %d bins"%nChans,"Processed 2-theta rings = ",nChans+1,
    16611662                style = wx.PD_ELAPSED_TIME|wx.PD_CAN_ABORT)
     1663            time0 = time.time()
    16621664            Error = G2img.AutoSpotMasks2(G2frame.ImageZ,data,Controls,nChans,dlg)
     1665            print(' Autospot processing time: %.2f'%(time.time()-time0))
    16631666            if not Error is None:
    16641667                G2frame.ErrorDialog('Auto spot search error',Error)
     
    18601863   
    18611864    def OnDelBtn(event):
    1862         data['SpotMask'] = {'esdMul':2,'spotMask':None}
     1865        data['SpotMask'] = {'esdMul':2.,'spotMask':None}
    18631866        wx.CallAfter(UpdateMasks,G2frame,data)
    18641867               
     
    19141917        data['Frames'] = []
    19151918    if 'SpotMask' not in data:
    1916         data['SpotMask'] = {'esdMul':2,'spotMask':None}
     1919        data['SpotMask'] = {'esdMul':2.,'spotMask':None}
    19171920    frame = data['Frames']             #3+ x,y pairs
    19181921    Arcs = data['Arcs']                 #radius, start/end azimuth, thickness
     
    19421945    mainSizer.Add(littleSizer,0,)
    19431946    spotSizer = wx.BoxSizer(wx.HORIZONTAL)
     1947    data['SpotMask']['esdMul'] = float(data['SpotMask']['esdMul'])
    19441948    spotSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Select spot range factor (1-10): '),0,WACV)
    19451949    spotSizer.Add(G2G.ValidatedTxtCtrl(G2frame.dataWindow,loc=data['SpotMask'],
     
    32003204        else:
    32013205            self.ImageMasks = {'Points':[],'Rings':[],'Arcs':[],'Polygons':[],'Frames':[],
    3202                                      'SpotMask':{'esdMul':2,'spotMask':None},
    3203                                    }
     3206                'SpotMask':{'esdMul':2.,'spotMask':None},}
    32043207       
    32053208    def StartLoop(self):
  • trunk/GSASIIscriptable.py

    r4307 r4317  
    30093009            ImgDict['Masks'] = {'Points':[],'Rings':[],'Arcs':[],'Polygons':[],
    30103010                                'Frames':[],'Thresholds':[(0,Imax),[0,Imax]],
    3011                                 'SpotMask':{'esdMul':2,'spotMask':None},
     3011                                'SpotMask':{'esdMul':2.,'spotMask':None},
    30123012                                    }
    30133013            ImgDict['Stress/Strain']  = {'Type':'True','d-zero':[],'Sample phi':0.0,
Note: See TracChangeset for help on using the changeset viewer.