Changeset 4671 for trunk/GSASIIstrMath.py

Timestamp:

Dec 12, 2020 1:30:31 PM (5 years ago)

Author:

vondreele

Message:

add refinable multiplier for a fixed background; multiplier is now normally > 0
usable for peak fitting and Rietved refinement
add the fixed background entry to all background defaults
fix bug in GetDetectorXY fo when cursor outside image - returns [0,0] not None; changes elsewhere to use this
GetTthAzmDsp? now returns explicit list not assumed tuple
put the abs in the nl.qr test for singularities in HessianLSQ
Add 'BF mult' to name list in G2obj
put a try - except TypeError? around setting plot style stuff in PlotPatterns?
Remove the setting of Pattern[0]BackFile? - this was redundant for PWDR
remove picker/pickradius from linescan plot - failed
remove the alternate fixed background definition ('_fixedVary', etc.)
clear the PhaseReaderClass?Drawing? dictionary upon import of phase from a gpx file

File:

• trunk/GSASIIstrMath.py (modified) (3 diffs)

trunk/GSASIIstrMath.py ¶

@@ -3190 +3190 @@
     hfx = ':%d:'%(hId)
     bakType = calcControls[hfx+'bakType']
-    fixedBkg = {i:Histogram['Background'][1][i] for i in Histogram['Background'][1] if i.startswith("_")} 
-    yb,Histogram['sumBk'] = G2pwd.getBackground(hfx,parmDict,bakType,calcControls[hfx+'histType'],x,fixedBkg)
+    fixback = Histogram['Background'][1].get('fixback',None)
+    yb,Histogram['sumBk'] = G2pwd.getBackground(hfx,parmDict,bakType,calcControls[hfx+'histType'],x,fixback)
     yc = np.zeros_like(yb)
     cw = np.diff(ma.getdata(x))
@@ -3441 +3441 @@
     bakType = calcControls[hfx+'bakType']
     dMdv = np.zeros(shape=(len(varylist),len(x)))
-    dMdb,dMddb,dMdpk = G2pwd.getBackgroundDerv(hfx,parmDict,bakType,calcControls[hfx+'histType'],x)
+    fixback = Histogram['Background'][1].get('fixback',None)
+    dMdb,dMddb,dMdpk,dMdfb = G2pwd.getBackgroundDerv(hfx,parmDict,bakType,calcControls[hfx+'histType'],x,fixback)
     if prc == 0 and hfx+'Back;0' in varylist: # for now assume that Back;x vars to not appear in constraints
         bBpos = varylist.index(hfx+'Back;0')
@@ -3460 +3461 @@
                 ip = names.index(parm)
                 dMdv[varylist.index(name)] += dMdpk[4*Id+ip]
+    if hfx+'BF mult' in varylist:
+        dMdv[varylist.index(hfx+'BF mult')] += dMdfb
     cw = np.diff(ma.getdata(x))
     cw = np.append(cw,cw[-1])