Changeset 1248 for trunk/GSASIIpwd.py

Timestamp:

Mar 13, 2014 2:16:20 PM (9 years ago)

Author:

vondreele

Message:

add setscale for SASD data
don't square the 1/cos(2-theta) correction to integrated intensities in ImageIntegrate?
scale SASD error bars by Scale
replace ':' with ';' in BkPk? parameter names
fix bug of missing Residuals in LS Refine

File:

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

trunk/GSASIIpwd.py

@@ -581 +581 @@
     while True:
         try:
-            pkP = parmDict[pfx+'BkPkpos:'+str(iD)]
-            pkI = parmDict[pfx+'BkPkint:'+str(iD)]
-            pkS = parmDict[pfx+'BkPksig:'+str(iD)]
-            pkG = parmDict[pfx+'BkPkgam:'+str(iD)]
+            pkP = parmDict[pfx+'BkPkpos;'+str(iD)]
+            pkI = parmDict[pfx+'BkPkint;'+str(iD)]
+            pkS = parmDict[pfx+'BkPksig;'+str(iD)]
+            pkG = parmDict[pfx+'BkPkgam;'+str(iD)]
             shl = 0.002
             Wd,fmin,fmax = getWidthsCW(pkP,pkS,pkG,shl)
@@ -675 +675 @@
     while True:
         try:
-            pkP = parmDict[pfx+'BkPkpos:'+str(iD)]
-            pkI = parmDict[pfx+'BkPkint:'+str(iD)]
-            pkS = parmDict[pfx+'BkPksig:'+str(iD)]
-            pkG = parmDict[pfx+'BkPkgam:'+str(iD)]
+            pkP = parmDict[pfx+'BkPkpos;'+str(iD)]
+            pkI = parmDict[pfx+'BkPkint;'+str(iD)]
+            pkS = parmDict[pfx+'BkPksig;'+str(iD)]
+            pkG = parmDict[pfx+'BkPkgam;'+str(iD)]
             shl = 0.002
             Wd,fmin,fmax = getWidthsCW(pkP,pkS,pkG,shl)