Changeset 179


Ignore:
Timestamp:
Oct 10, 2007 10:21:20 AM (15 years ago)
Author:
srkline
Message:

Closing RT ticket by using 76 point quadrature on MultiShell? model

Also has some minor changes to PlotManager? and Wrapper, intermediate changes as I'm working towards 2D fitting functions. Shouldn't break anything, but doesn't really add anything just yet.

Location:
sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/MultiShell.ipf

    r166 r179  
    186186End 
    187187 
    188 // this is all there is to the smeared calculation! 
     188// this model needs 76 Gauss points for a proper smearing calculation 
     189// since there can be sharp interference fringes that develop from the stacking 
    189190Function SmearedMultiShellSphere(s) :FitFunc 
    190191        Struct ResSmearAAOStruct &s 
    191192 
    192193//      the name of your unsmeared model (AAO) is the first argument 
    193         Smear_Model_20(MultiShellSphere,s.coefW,s.xW,s.yW,s.resW) 
     194        Smear_Model_76(MultiShellSphere,s.coefW,s.xW,s.yW,s.resW) 
    194195 
    195196        return(0) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/Wrapper.ipf

    r177 r179  
    123123        String list,tmp 
    124124        list = FunctionList("*",";","KIND:10")          //get every user defined curve fit function 
    125 //      list = RemoveFromList("Sum_Model", list  ,";") 
    126          
     125 
     126        //now start to remove everything the user doesn't need to see... 
     127                 
    127128        tmp = FunctionList("*_proto",";","KIND:10")             //prototypes 
    128129        list = RemoveFromList(tmp, list  ,";") 
     
    137138        list = RemoveFromList("NewGF_SetXWaveInList", list) 
    138139        list = RemoveFromList("NewGlblFitFuncAAOStruct", list) 
     140         
     141        // more to remove as a result of 2D/Gizmo 
     142        list = RemoveFromList("A_WMRunLessThanDelta", list) 
     143        list = RemoveFromList("WMFindNaNValue", list) 
     144        list = RemoveFromList("WM_Make3DBarChartParametricWave", list) 
     145        list = RemoveFromList("UpdateQxQy2Mat", list) 
     146         
    139147 
    140148        tmp = FunctionList("f*",";","NPARAMS:2")                //point calculations 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/PlotManager.ipf

    r172 r179  
    144144         
    145145        Label left "I(q)" 
    146         SVAR angst = root:myGlobals:gAngstStr 
    147146        Label bottom "q (A\\S-1\\M)" 
    148147         
Note: See TracChangeset for help on using the changeset viewer.