Changeset 4970


Ignore:
Timestamp:
Jun 22, 2021 4:50:29 PM (3 months ago)
Author:
vondreele
Message:

fix PlotAAProb bugs - leftover pickradius & an xpos error
fix scale factor bug & set floor as 1.e-12 for PWDR histograms

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIplot.py

    r4958 r4970  
    56345634    def OnMotion(event):
    56355635        xpos,ypos = event.xdata,event.ydata
    5636         if xpos > 1.:
     5636        if xpos and xpos > 1.:
    56375637            if 0 <= xpos < len(resNames):
    56385638                resName = resNames[int(xpos+.5)-1]
     
    56665666        colors = list(np.where(np.array(Probs1)>thresh[0][1],'r','b'))
    56675667        resNums = np.arange(len(resNames))
    5668         Plot1.bar(resNums,Probs1,color=colors,linewidth=0,
    5669                                 picker=True,pickradius=1)
     5668        Plot1.bar(resNums,Probs1,color=colors,linewidth=0,picker=True)
    56705669        if thresh is not None:
    56715670            for item in thresh[0]:
     
    56755674        Plot2.set_xlabel(r'Residue',fontsize=14)       
    56765675        colors = list(np.where(np.array(Probs2)>thresh[1][1],'r','b'))
    5677         Plot2.bar(resNums,Probs2,color=colors,linewidth=0,
    5678                                 picker=True,pickradius=1)
     5676        Plot2.bar(resNums,Probs2,color=colors,linewidth=0,picker=True)
    56795677        if thresh is not None:
    56805678            for item in thresh[1]:
  • trunk/GSASIIstrIO.py

    r4958 r4970  
    30753075                wtFrSum[hId] = 0.
    30763076            if 'PWDR' in histogram:
    3077                 parmDict[pfx+'Scale'] = max(1.e-4,parmDict[pfx+'Scale'])
     3077                parmDict[pfx+'Scale'] = max(1.e-12,parmDict[pfx+'Scale'])
    30783078                for item in ['Scale','Extinction']:
    30793079                    hapData[item][0] = parmDict[pfx+item]
     
    37113711       
    37123712            Sample = Histogram['Sample Parameters']
    3713             parmDict[pfx+'Scale'] = max(1.e-4,parmDict[pfx+'Scale'])                        #put floor on phase fraction scale
     3713            parmDict[pfx+'Scale'] = max(1.e-12,parmDict[pfx+'Scale'])                        #put floor on phase fraction scale
    37143714            sampSig = SetSampleParms(pfx,Sample,parmDict,sigDict)
    37153715
  • trunk/GSASIIstrMath.py

    r4958 r4970  
    25992599def GetIntensityCorr(refl,im,uniq,G,g,pfx,phfx,hfx,SGData,calcControls,parmDict):
    26002600    'Needs a doc string'    #need powder extinction!
    2601     parmDict[phfx+'Scale'] = max(1.e-4,parmDict[hfx+'Scale'])                        #put floor on phase fraction scale
    2602     parmDict[hfx+'Scale'] = max(1.e-4,parmDict[hfx+'Scale'])                        #put floor on phase fraction scale
     2601    parmDict[phfx+'Scale'] = max(1.e-12,parmDict[phfx+'Scale'])                        #put floor on phase fraction scale
     2602    parmDict[hfx+'Scale'] = max(1.e-12,parmDict[hfx+'Scale'])                        #put floor on phase fraction scale
    26032603    Icorr = parmDict[phfx+'Scale']*parmDict[hfx+'Scale']*refl[3+im]               #scale*multiplicity
    26042604    if 'X' in parmDict[hfx+'Type']:
Note: See TracChangeset for help on using the changeset viewer.