Changeset 1337


Ignore:
Timestamp:
May 7, 2014 3:30:22 PM (8 years ago)
Author:
vondreele
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r1334 r1337  
    28122812                ILimits = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Limits'))
    28132813                IInst = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Instrument Parameters'))
    2814                 IfOK,result,varyList,sig,Rvals,covMatrix,Msg = G2sasd.ModelFit(IProfile,IProfDict,ILimits,ISample,IModel)
     2814                IfOK,result,varyList,sig,Rvals,covMatrix,parmDict,Msg = G2sasd.ModelFit(IProfile,IProfDict,ILimits,ISample,IModel)
    28152815                JModel = copy.copy(IModel)
    28162816                if not IfOK:
     
    28242824                G2sasd.ModelFxn(IProfile,IProfDict,ILimits,ISample,IModel)
    28252825                SeqResult[name] = {'variables':result[0],'varyList':varyList,'sig':sig,'Rvals':Rvals,
    2826                     'covMatrix':covMatrix,'title':name}
     2826                    'covMatrix':covMatrix,'title':name,'parmDict':parmDict}
    28272827            else:
    28282828                dlg.Destroy()
  • trunk/GSASIIsasd.py

    r1327 r1337  
    12601260        SetModelParms()
    12611261        covMatrix = covM*Rvals['GOF']
    1262         return True,result,varyList,sig,Rvals,covMatrix,''
     1262        return True,result,varyList,sig,Rvals,covMatrix,parmDict,''
    12631263    except (ValueError,TypeError):      #when bad LS refinement; covM missing or with nans
    1264         return False,0,0,0,0,0,Msg
     1264        return False,0,0,0,0,0,0,Msg
    12651265   
    12661266def ModelFxn(Profile,ProfDict,Limits,Sample,sasdData):
Note: See TracChangeset for help on using the changeset viewer.