Changeset 1895

Timestamp:

Jun 17, 2015 1:28:30 PM (7 years ago)

Author:

vondreele

Message:

fixes to background & twin stuff

Location:

trunk

Files:

• GSASIIpwdGUI.py (modified) (2 diffs)
• GSASIIstrMath.py (modified) (2 diffs)

trunk/GSASIIpwdGUI.py

@@ -792 +792 @@
 
     def OnBkgFit(event):
-#        def SetInstParms(Inst):
-#            dataType = Inst['Type'][0]
-#            insVary = []
-#            insNames = []
-#            insVals = []
-#            for parm in Inst:
-#                insNames.append(parm)
-#                insVals.append(Inst[parm][1])
-#                if parm in ['U','V','W','X','Y','SH/L','I(L2)/I(L1)','alpha',
-#                    'beta-0','beta-1','beta-q','sig-0','sig-1','sig-2','sig-q',] and Inst[parm][2]:
-#                        insVary.append(parm)
-#            instDict = dict(zip(insNames,insVals))
-#            instDict['X'] = max(instDict['X'],0.01)
-#            instDict['Y'] = max(instDict['Y'],0.01)
-#            if 'SH/L' in instDict:
-#                instDict['SH/L'] = max(instDict['SH/L'],0.002)
-#            return dataType,instDict,insVary
+        def SetInstParms(Inst):
+            dataType = Inst['Type'][0]
+            insVary = []
+            insNames = []
+            insVals = []
+            for parm in Inst:
+                insNames.append(parm)
+                insVals.append(Inst[parm][1])
+                if parm in ['U','V','W','X','Y','SH/L','I(L2)/I(L1)','alpha',
+                    'beta-0','beta-1','beta-q','sig-0','sig-1','sig-2','sig-q',] and Inst[parm][2]:
+                        insVary.append(parm)
+            instDict = dict(zip(insNames,insVals))
+            instDict['X'] = max(instDict['X'],0.01)
+            instDict['Y'] = max(instDict['Y'],0.01)
+            if 'SH/L' in instDict:
+                instDict['SH/L'] = max(instDict['SH/L'],0.002)
+            return dataType,instDict,insVary
     
         PatternId = G2frame.PatternId        
@@ -836 +836 @@
 
         # load instrument and background params
-#        dataType,insDict,insVary = SetInstParms(inst)
+        dataType,insDict,insVary = SetInstParms(inst)
         bakType,bakDict,bakVary = G2pwd.SetBackgroundParms(background)
         # how many background parameters are refined?

trunk/GSASIIstrMath.py

@@ -822 +822 @@
         TwinLaw = calcControls[phfx+'TwinLaw']
         TwinFr = np.array([parmDict[phfx+'TwinFr:'+str(i)] for i in range(len(TwinLaw))])
-        if len(TwinLaw) > 1:
-            TwinFr[0] = 1.-np.sum(TwinFr[1:])        
     Tdata,Mdata,Fdata,Xdata,dXdata,IAdata,Uisodata,Uijdata = GetAtomFXU(pfx,calcControls,parmDict)
     FF = np.zeros(len(Tdata))
@@ -917 +915 @@
         TwinLaw = calcControls[phfx+'TwinLaw']
         TwinFr = np.array([parmDict[phfx+'TwinFr:'+str(i)] for i in range(len(TwinLaw))])
-        if len(TwinLaw) > 1:
-            TwinFr[0] = 1.-np.sum(TwinFr[1:])
     nTwin = len(TwinLaw)        
     nRef = len(refDict['RefList'])