Ignore:
Timestamp:
Nov 14, 2008 2:11:59 PM (14 years ago)
Author:
srkline
Message:

Adding the model of a cylinder with spherical end caps. By taking all of the limiting cases, 5 models are added. Since the geometries are sufficiently different, I thought it best to add as separate models. Corresponding changes have been made to the Wrapper and the modelPicker

Location:
sans/Dev/trunk/NCNR_User_Procedures/Analysis
Files:
5 added
2 edited

Legend:

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

    r444 r449  
    127127////paste here... after deleting the old make statement and list 
    128128         
    129   Make/O/T/N=80  SANS_Model_List 
     129  Make/O/T/N=85  SANS_Model_List 
    130130 
    131131  SANS_Model_List[0] = "BE_Polyelectrolyte.ipf" 
     
    210210  SANS_Model_List[78] = "BCC_ParaCrystal.ipf" 
    211211  SANS_Model_List[79] = "FCC_ParaCrystal.ipf" 
     212  SANS_Model_List[80] = "Spherocylinder.ipf" 
     213  SANS_Model_List[81] = "Dumbbell.ipf" 
     214  SANS_Model_List[82] = "ConvexLens.ipf" 
     215  SANS_Model_List[83] = "CappedCylinder.ipf" 
     216  SANS_Model_List[84] = "Barbell.ipf" 
    212217 
    213218 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

    r444 r449  
    194194        tmp = FunctionList("*_proto",";","KIND:10")             //prototypes 
    195195        list = RemoveFromList(tmp, list  ,";") 
     196         
    196197        //prototypes that show up if GF is loaded 
    197198        list = RemoveFromList("GFFitFuncTemplate", list) 
     
    217218 
    218219        // SANS Reduction bits 
    219         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;" 
     220        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;" 
    220221        list = RemoveFromList(tmp, list  ,";") 
    221         list = RemoveFromList("Monte_SANS", list) 
    222222 
    223223        // USANS Reduction bits 
    224224        tmp = "DSM_Guinier_Fit;RemoveMaskedPoints;" 
     225        list = RemoveFromList(tmp, list  ,";") 
     226 
     227        //more functions from analysis models (2008) 
     228        tmp = "Barbell_Inner;Barbell_Outer;Barbell_integrand;BCC_Integrand;Integrand_BCC_Inner;Integrand_BCC_Outer;" 
     229        list = RemoveFromList(tmp, list  ,";") 
     230        tmp = "CapCyl;CapCyl_Inner;CapCyl_Outer;ConvLens;ConvLens_Inner;ConvLens_Outer;" 
     231        list = RemoveFromList(tmp, list  ,";") 
     232        tmp = "Dumb;Dumb_Inner;Dumb_Outer;FCC_Integrand;Integrand_FCC_Inner;Integrand_FCC_Outer;" 
     233        list = RemoveFromList(tmp, list  ,";") 
     234        tmp = "Integrand_SC_Inner;Integrand_SC_Outer;SC_Integrand;SphCyl;SphCyl_Inner;SphCyl_Outer;" 
    225235        list = RemoveFromList(tmp, list  ,";") 
    226236 
Note: See TracChangeset for help on using the changeset viewer.