Changeset 1504

Timestamp:

Sep 20, 2014 2:44:23 PM (9 years ago)

Author:

vondreele

Message:

fix plot HKL routines for superlattice cases. Don't plot them for 2D plots.

File:

• trunk/GSASIIplot.py (modified) (4 diffs)

trunk/GSASIIplot.py

@@ -358 +358 @@
     HKLmin = Data['HKLmin']
     FosqMax = Data['FoMax']
+    Super = Data.get('Super',0)
     FoMax = math.sqrt(FosqMax)
     xlabel = ['k, h=','h, k=','h, l=']
@@ -370 +371 @@
     for refl in hklRef:
         H = np.array(refl[:3])
+        if Super and np.any(refl[3:3+Super]):   #skip superlattice reflections for 2D plot
+            continue
         if 'HKLF' in Name:
-            Fosq,sig,Fcsq = refl[5:8]
+            Fosq,sig,Fcsq = refl[5+Super:8+Super]
         else:
-            Fosq,sig,Fcsq = refl[8],1.0,refl[9]
+            Fosq,sig,Fcsq = refl[8+Super],1.0,refl[9+Super]
         HKL.append(H)
         HKLF.append([Fosq,sig,Fcsq])
@@ -522 +525 @@
         cell = [10,10,10,90,90,90]
     drawingData = Data['Drawing']
+    Super = Data.get('Super',0)
     defaultViewPt = copy.copy(drawingData['viewPoint'])
     Amat,Bmat = G2lat.cell2AB(cell)         #Amat - crystal to cartesian, Bmat - inverse
@@ -549 +553 @@
             H = np.array(refl[:3])
             if 'HKLF' in Name:
-                Fosq,sig,Fcsq = refl[5:8]
+                Fosq,sig,Fcsq = refl[5+Super:8+Super]
             else:
-                Fosq,sig,Fcsq = refl[8],1.0,refl[9]
+                Fosq,sig,Fcsq = refl[8+Super],1.0,refl[9+Super]
             HKL.append(H)
             if Data['Type'] == 'Unit':