Ignore:
Timestamp:
Aug 3, 2009 6:22:39 PM (13 years ago)
Author:
srkline
Message:

Lots of changes to add the first version of a USANS simulator, like SASCALC

(!) first issue is with the entanglement of dependencies - need to load SANS macros first!

otherwise, worth a first test for interface and accuracy. behavior is similar to the 1D SASCALC

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

    r516 r544  
    195195Function/S W_FunctionPopupList() 
    196196        String list,tmp 
    197         list = FunctionList("*",";","KIND:10")          //get every user defined curve fit function 
    198  
    199         //now start to remove everything the user doesn't need to see... 
    200  
    201         tmp = FunctionList("*_proto",";","KIND:10")             //prototypes 
    202         list = RemoveFromList(tmp, list  ,";") 
    203          
    204         //prototypes that show up if GF is loaded 
    205         list = RemoveFromList("GFFitFuncTemplate", list) 
    206         list = RemoveFromList("GFFitAllAtOnceTemplate", list) 
    207         list = RemoveFromList("NewGlblFitFunc", list) 
    208         list = RemoveFromList("NewGlblFitFuncAllAtOnce", list) 
    209         list = RemoveFromList("GlobalFitFunc", list) 
    210         list = RemoveFromList("GlobalFitAllAtOnce", list) 
    211         list = RemoveFromList("GFFitAAOStructTemplate", list) 
    212         list = RemoveFromList("NewGF_SetXWaveInList", list) 
    213         list = RemoveFromList("NewGlblFitFuncAAOStruct", list) 
    214          
    215         // more to remove as a result of 2D/Gizmo 
    216         list = RemoveFromList("A_WMRunLessThanDelta", list) 
    217         list = RemoveFromList("WMFindNaNValue", list) 
    218         list = RemoveFromList("WM_Make3DBarChartParametricWave", list) 
    219         list = RemoveFromList("UpdateQxQy2Mat", list) 
    220         list = RemoveFromList("MakeBSMask", list) 
    221          
    222         // MOTOFIT/GenFit bits 
    223         tmp = "GEN_allatoncefitfunc;GEN_fitfunc;GetCheckBoxesState;MOTO_GFFitAllAtOnceTemplate;MOTO_GFFitFuncTemplate;MOTO_NewGF_SetXWaveInList;MOTO_NewGlblFitFunc;MOTO_NewGlblFitFuncAllAtOnce;GeneticFit_UnSmearedModel;GeneticFit_SmearedModel;" 
    224         list = RemoveFromList(tmp, list  ,";") 
    225  
    226         // SANS Reduction bits 
    227         tmp = "ASStandardFunction;Ann_1D_Graph;Avg_1D_Graph;BStandardFunction;CStandardFunction;Draw_Plot1D;MyMat2XYZ;NewDirection;SANSModelAAO_MCproto;Monte_SANS_Threaded;Monte_SANS_NotThreaded;Monte_SANS_W1;Monte_SANS_W2;Monte_SANS;FractionReachingDetector;" 
    228         list = RemoveFromList(tmp, list  ,";") 
    229  
    230         // USANS Reduction bits 
    231         tmp = "DSM_Guinier_Fit;RemoveMaskedPoints;" 
    232         list = RemoveFromList(tmp, list  ,";") 
    233  
    234         //more functions from analysis models (2008) 
    235         tmp = "Barbell_Inner;Barbell_Outer;Barbell_integrand;BCC_Integrand;Integrand_BCC_Inner;Integrand_BCC_Outer;" 
    236         list = RemoveFromList(tmp, list  ,";") 
    237         tmp = "CapCyl;CapCyl_Inner;CapCyl_Outer;ConvLens;ConvLens_Inner;ConvLens_Outer;" 
    238         list = RemoveFromList(tmp, list  ,";") 
    239         tmp = "Dumb;Dumb_Inner;Dumb_Outer;FCC_Integrand;Integrand_FCC_Inner;Integrand_FCC_Outer;" 
    240         list = RemoveFromList(tmp, list  ,";") 
    241         tmp = "Integrand_SC_Inner;Integrand_SC_Outer;SC_Integrand;SphCyl;SphCyl_Inner;SphCyl_Outer;" 
    242         list = RemoveFromList(tmp, list  ,";") 
    243  
    244  
    245         tmp = FunctionList("f*",";","NPARAMS:2")                //point calculations 
    246         list = RemoveFromList(tmp, list  ,";") 
    247          
    248         tmp = FunctionList("fSmear*",";","NPARAMS:3")           //smeared dependency calculations 
    249         list = RemoveFromList(tmp, list  ,";") 
    250          
    251 //      tmp = FunctionList("*X",";","KIND:4")           //XOPs, but these shouldn't show up if KIND:10 is used initially 
    252 //      Print "X* = ",tmp 
    253 //      print " " 
    254 //      list = RemoveFromList(tmp, list  ,";") 
    255          
    256         //non-fit functions that I can't seem to filter out 
    257         list = RemoveFromList("BinaryHS_PSF11;BinaryHS_PSF12;BinaryHS_PSF22;EllipCyl_Integrand;PP_Inner;PP_Outer;Phi_EC;TaE_Inner;TaE_Outer;",list,";") 
     197        //get every user defined curve fit function, remove everything the user doesn't need to see... 
     198        list = User_FunctionPopupList()          
    258199 
    259200        if(strlen(list)==0) 
Note: See TracChangeset for help on using the changeset viewer.