Changeset 1263 for trunk/GSASIIsasd.py


Ignore:
Timestamp:
Mar 26, 2014 2:15:16 PM (8 years ago)
Author:
vondreele
Message:

comment out the LEAVE_WINDOW in ValidatedTextCtrl? - leads to weird behavior when just moving mouse around.
Add SASD Model Add facility for Particle Modeling
Add Neutron CW SASD import & change default file extensions for SASD.
Begin Unified & Model fit routines - they don't do anything yet

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIsasd.py

    r1260 r1263  
    783783    data['Size']['Distribution'] = [Bins,Dbins,BinMag/(2.*Dbins)]
    784784       
     785################################################################################
     786#### Unified fit
     787################################################################################
     788
     789def UnifiedFit(Profile,ProfDict,Limits,Substances,Sample,data):
     790    print 'do unified fit'
     791   
     792def UnifiedFxn(Q,G,Rg,B,Rgcf,P,SQfxn,args=[]):
     793    termA = G*np.exp(-((Q*Rg)**2)/3.)
     794    termB = B*np.exp(-((Q*Rgcf)**2)/3.)
     795    termC = (scsp.erf(Q*Rg/np.sqrt(6))**3/Q)**P
     796    return SQfxn(Q,args)*termA+(termB*termC)
     797   
     798
     799
     800################################################################################
     801#### Modelling
     802################################################################################
     803
     804def ModelFit(Profile,ProfDict,Limits,Substances,Sample,data):
     805    print 'do model fit'
     806           
    785807   
    786808################################################################################
Note: See TracChangeset for help on using the changeset viewer.