Changeset 2430


Ignore:
Timestamp:
Aug 18, 2016 10:42:43 AM (6 years ago)
Author:
vondreele
Message:

force limits from d-min to be within allowed range & less than 168.5 deg 2-theta

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIlattice.py

    r2369 r2430  
    608608    if 'C' in Inst['Type'][0] or 'PKS' in Inst['Type'][0]:
    609609        wave = G2mth.getWave(Inst)
    610         pos = 2.0*asind(wave/(2.*dsp))+Inst.get('Zero',[0,0])[1]             
     610        val = min(0.995,wave/(2.*dsp))  #set max at 168deg
     611        pos = 2.0*asind(val)+Inst.get('Zero',[0,0])[1]             
    611612    else:   #'T'OF
    612613        pos = Inst['difC'][1]*dsp+Inst['Zero'][1]+Inst['difA'][1]*dsp**2+Inst.get('difB',[0,0,False])[1]/dsp
  • trunk/GSASIIphsGUI.py

    r2429 r2430  
    68646864                Tmin = G2lat.Dsp2pos(inst,dmin)
    68656865                if 'T' in inst['Type'][0]:
    6866                     limits[1][0] = Tmin
     6866                    limits[1][0] = max(limits[0][0],Tmin)
    68676867                else:
    6868                     limits[1][1] = Tmin
     6868                    limits[1][1] = min(limits[0][1],Tmin)
    68696869        PawleyPeaks = []
    68706870        HKLd = np.array(G2lat.GenHLaue(dmin,SGData,A))
Note: See TracChangeset for help on using the changeset viewer.