Changeset 520 for trunk/GSASIIlattice.py

Timestamp:

Mar 14, 2012 3:17:17 PM (10 years ago)

Author:

vondreele

Message:

separate getHKLmax

File:

• trunk/GSASIIlattice.py (modified) (2 diffs)

trunk/GSASIIlattice.py

@@ -590 +590 @@
                             HKL.append([h,k,l,rdsq2d(rdsq,6),-1])
     return sortHKLd(HKL,True,False)
+
+def getHKLmax(dmin,SGData,A):
+    #finds maximum allowed hkl for given A within dmin
+    SGLaue = SGData['SGLaue']
+    if SGLaue in ['3R','3mR']:        #Rhombohedral axes
+        Hmax = [0,0,0]
+        cell = A2cell(A)
+        aHx = cell[0]*math.sqrt(2.0*(1.0-cosd(cell[3])))
+        cHx = cell[0]*math.sqrt(3.0*(1.0+2.0*cosd(cell[3])))
+        Hmax[0] = Hmax[1] = int(round(aHx/dmin))
+        Hmax[2] = int(round(cHx/dmin))
+        #print Hmax,aHx,cHx
+    else:                           # all others
+        Hmax = MaxIndex(dmin,A)
+    return Hmax
     
 def GenHLaue(dmin,SGData,A):
@@ -614 +629 @@
     SGUniq = SGData['SGUniq']
     #finds maximum allowed hkl for given A within dmin
-    if SGLaue in ['3R','3mR']:        #Rhombohedral axes
-        Hmax = [0,0,0]
-        cell = A2cell(A)
-        aHx = cell[0]*math.sqrt(2.0*(1.0-cosd(cell[3])))
-        cHx = cell[0]*math.sqrt(3.0*(1.0+2.0*cosd(cell[3])))
-        Hmax[0] = Hmax[1] = int(round(aHx/dmin))
-        Hmax[2] = int(round(cHx/dmin))
-        #print Hmax,aHx,cHx
-    else:                           # all others
-        Hmax = MaxIndex(dmin,A)
+    Hmax = getHKLmax(dmin,SGData,A)
         
     dminsq = 1./(dmin**2)