Changeset 4697


Ignore:
Timestamp:
Jan 2, 2021 9:30:28 AM (11 months ago)
Author:
vondreele
Message:

move superminusone definition to header block in G2pwdrGUI
replace deprecated GetLabel? with GetItemLabelText? in G2restrGUI
set default gain map color to 'gray' & force all gain map > 1200 or < 800 toequal 1000 - gets rid of zingers & other flaws

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r4692 r4697  
    12841284            Ipix = IyInt(TA[0])
    12851285            GainMap[iBeg:iFin,jBeg:jFin] = image[iBeg:iFin,jBeg:jFin]/(Ipix*TA[3])
    1286     GainMap = np.nan_to_num(GainMap)
     1286    GainMap = np.nan_to_num(GainMap,1.0)
    12871287    GainMap = sdif.gaussian_filter(GainMap,3.,order=0)
    12881288    return 1./GainMap
  • trunk/GSASIIimgGUI.py

    r4692 r4697  
    181181            Data['formatName'] = 'GSAS-II image'
    182182            Data['range'] = [(800,1200),[800,1200]]
     183            GainMap = np.where(GainMap > 1200,1000,GainMap)
     184            GainMap = np.where(GainMap < 800,1000,GainMap)
    183185            G2IO.PutG2Image(newimagefile,[],data,Npix,GainMap)
    184186            Id = G2frame.GPXtree.AppendItem(parent=G2frame.root,text='IMG '+os.path.split(newimagefile)[1])
  • trunk/GSASIIpwdGUI.py

    r4695 r4697  
    6565    Pwrm4 = unichr(0x207b)+unichr(0x2074)
    6666    Angstr = unichr(0x00c5)
     67    superMinusOne = unichr(0xaf)+unichr(0xb9)
    6768else:
    6869    GkDelta = chr(0x0394)
     
    7475    Pwrm4 = chr(0x207b)+chr(0x2074)
    7576    Angstr = chr(0x00c5)   
     77    superMinusOne = chr(0xaf)+chr(0xb9)
    7678# trig functions in degrees
    7779sind = lambda x: math.sin(x*math.pi/180.)
     
    13931395        pwddata = G2frame.GPXtree.GetItemPyData(PatternId)[1]
    13941396        auxPlot = G2pwd.MakeRDF(RDFcontrols,background,inst,pwddata)
    1395         if '2' in platform.python_version_tuple()[0]:
    1396             superMinusOne = unichr(0xaf)+unichr(0xb9)
    1397         else:
    1398             superMinusOne = chr(0xaf)+chr(0xb9)
    13991397        for plot in auxPlot:
    14001398            XY = np.array(plot[:2])
  • trunk/GSASIIrestrGUI.py

    r4635 r4697  
    11711171        items = G2frame.dataWindow.RestraintEdit.GetMenuItems()
    11721172        for item in items:
    1173             if item.GetLabel() in ['Change value']:
     1173            if item.GetItemLabelText() in ['Change value']:
    11741174                item.Enable(False)
    11751175
Note: See TracChangeset for help on using the changeset viewer.