Changeset 4030

Timestamp:

Jun 17, 2019 2:24:27 PM (3 years ago)

Author:

vondreele

Message:

fix defaults for ka1-Ka2 powder data to be Bragg-Brentano for both GUI & scriptable G2

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIpwd.py (modified) (1 diff)

trunk/GSASIIdataGUI.py

@@ -1342 +1342 @@
             newVals.append(val)
             il += 1
+        if 'Lam1' in newItems:
+            rd.Sample.update({'Type':'Bragg-Brentano','Shift':[0.,False],'Transparency':[0.,False],
+                'SurfRoughA':[0.,False],'SurfRoughB':[0.,False]})
+        else:
+            rd.Sample.update({'Type':'Debye-Scherrer','Absorption':[0.,False],'DisplaceX':[0.,False],'DisplaceY':[0.,False]})
         return [G2fil.makeInstDict(newItems,newVals,len(newVals)*[False,]),{}]
         

trunk/GSASIIpwd.py

@@ -3128 +3128 @@
         try:
             refId = reflDict[hash('%5d%5d%5d'%(h,k,l))]
-        except KeyError:    #added reflections
-            break
+        except KeyError:    #added reflections at end skipped
+            continue
         reflData[refId][8] = Fosq
         reflData[refId][10] = phase