Changeset 2430

Timestamp:

Aug 18, 2016 10:42:43 AM (7 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:

• GSASIIlattice.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (1 diff)

trunk/GSASIIlattice.py

@@ -608 +608 @@
     if 'C' in Inst['Type'][0] or 'PKS' in Inst['Type'][0]:
         wave = G2mth.getWave(Inst)
-        pos = 2.0*asind(wave/(2.*dsp))+Inst.get('Zero',[0,0])[1]             
+        val = min(0.995,wave/(2.*dsp))  #set max at 168deg
+        pos = 2.0*asind(val)+Inst.get('Zero',[0,0])[1]             
     else:   #'T'OF
         pos = Inst['difC'][1]*dsp+Inst['Zero'][1]+Inst['difA'][1]*dsp**2+Inst.get('difB',[0,0,False])[1]/dsp

trunk/GSASIIphsGUI.py

@@ -6864 +6864 @@
                 Tmin = G2lat.Dsp2pos(inst,dmin)
                 if 'T' in inst['Type'][0]:
-                    limits[1][0] = Tmin
+                    limits[1][0] = max(limits[0][0],Tmin)
                 else:
-                    limits[1][1] = Tmin
+                    limits[1][1] = min(limits[0][1],Tmin)
         PawleyPeaks = []
         HKLd = np.array(G2lat.GenHLaue(dmin,SGData,A))