Changeset 449

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:

• Models/NewModels_2008/Barbell_v40.ipf (added)
• Models/NewModels_2008/CappedCylinder_v40.ipf (added)
• Models/NewModels_2008/ConvexLens_v40.ipf (added)
• Models/NewModels_2008/Dumbbell_v40.ipf (added)
• Models/NewModels_2008/Spherocylinder_v40.ipf (added)
• Packages/ModelPicker/SANSModelPicker_v40.ipf (modified) (2 diffs)
• Packages/Wrapper_v40.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/ModelPicker/SANSModelPicker_v40.ipf

@@ -127 +127 @@
 ////paste here... after deleting the old make statement and list
         
-  Make/O/T/N=80  SANS_Model_List
+  Make/O/T/N=85  SANS_Model_List
 
   SANS_Model_List[0] = "BE_Polyelectrolyte.ipf"
@@ -210 +210 @@
   SANS_Model_List[78] = "BCC_ParaCrystal.ipf"
   SANS_Model_List[79] = "FCC_ParaCrystal.ipf"
+  SANS_Model_List[80] = "Spherocylinder.ipf"
+  SANS_Model_List[81] = "Dumbbell.ipf"
+  SANS_Model_List[82] = "ConvexLens.ipf"
+  SANS_Model_List[83] = "CappedCylinder.ipf"
+  SANS_Model_List[84] = "Barbell.ipf"
 
 

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

@@ -194 +194 @@
         tmp = FunctionList("*_proto",";","KIND:10")             //prototypes
         list = RemoveFromList(tmp, list  ,";")
+        
         //prototypes that show up if GF is loaded
         list = RemoveFromList("GFFitFuncTemplate", list)
@@ -217 +218 @@
 
         // SANS Reduction bits
-        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;"
+        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;"
         list = RemoveFromList(tmp, list  ,";")
-        list = RemoveFromList("Monte_SANS", list)
 
         // USANS Reduction bits
         tmp = "DSM_Guinier_Fit;RemoveMaskedPoints;"
+        list = RemoveFromList(tmp, list  ,";")
+
+        //more functions from analysis models (2008)
+        tmp = "Barbell_Inner;Barbell_Outer;Barbell_integrand;BCC_Integrand;Integrand_BCC_Inner;Integrand_BCC_Outer;"
+        list = RemoveFromList(tmp, list  ,";")
+        tmp = "CapCyl;CapCyl_Inner;CapCyl_Outer;ConvLens;ConvLens_Inner;ConvLens_Outer;"
+        list = RemoveFromList(tmp, list  ,";")
+        tmp = "Dumb;Dumb_Inner;Dumb_Outer;FCC_Integrand;Integrand_FCC_Inner;Integrand_FCC_Outer;"
+        list = RemoveFromList(tmp, list  ,";")
+        tmp = "Integrand_SC_Inner;Integrand_SC_Outer;SC_Integrand;SphCyl;SphCyl_Inner;SphCyl_Outer;"
         list = RemoveFromList(tmp, list  ,";")