Changeset 1337

Timestamp:

May 7, 2014 3:30:22 PM (9 years ago)

Author:

vondreele

Message:

add parmDict to SASD seq output dictionary to match that from PWDR

Location:

trunk

Files:

• GSASIIpwdGUI.py (modified) (2 diffs)
• GSASIIsasd.py (modified) (1 diff)

trunk/GSASIIpwdGUI.py

@@ -2812 +2812 @@
                 ILimits = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Limits'))
                 IInst = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Instrument Parameters'))
-                IfOK,result,varyList,sig,Rvals,covMatrix,Msg = G2sasd.ModelFit(IProfile,IProfDict,ILimits,ISample,IModel)
+                IfOK,result,varyList,sig,Rvals,covMatrix,parmDict,Msg = G2sasd.ModelFit(IProfile,IProfDict,ILimits,ISample,IModel)
                 JModel = copy.copy(IModel)
                 if not IfOK:
@@ -2824 +2824 @@
                 G2sasd.ModelFxn(IProfile,IProfDict,ILimits,ISample,IModel)
                 SeqResult[name] = {'variables':result[0],'varyList':varyList,'sig':sig,'Rvals':Rvals,
-                    'covMatrix':covMatrix,'title':name}
+                    'covMatrix':covMatrix,'title':name,'parmDict':parmDict}
             else:
                 dlg.Destroy()

trunk/GSASIIsasd.py

@@ -1260 +1260 @@
         SetModelParms()
         covMatrix = covM*Rvals['GOF']
-        return True,result,varyList,sig,Rvals,covMatrix,''
+        return True,result,varyList,sig,Rvals,covMatrix,parmDict,''
     except (ValueError,TypeError):      #when bad LS refinement; covM missing or with nans
-        return False,0,0,0,0,0,Msg
+        return False,0,0,0,0,0,0,Msg
     
 def ModelFxn(Profile,ProfDict,Limits,Sample,sasdData):