Changeset 179 for sans/Analysis

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:

• NewModels_2006/MultiShell.ipf (modified) (1 diff)
• Packages/Wrapper.ipf (modified) (2 diffs)
• PlotManager.ipf (modified) (1 diff)

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

@@ -186 +186 @@
 End
 
-// this is all there is to the smeared calculation!
+// this model needs 76 Gauss points for a proper smearing calculation
+// since there can be sharp interference fringes that develop from the stacking
 Function SmearedMultiShellSphere(s) :FitFunc
         Struct ResSmearAAOStruct &s
 
 //      the name of your unsmeared model (AAO) is the first argument
-        Smear_Model_20(MultiShellSphere,s.coefW,s.xW,s.yW,s.resW)
+        Smear_Model_76(MultiShellSphere,s.coefW,s.xW,s.yW,s.resW)
 
         return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/Wrapper.ipf

@@ -123 +123 @@
         String list,tmp
         list = FunctionList("*",";","KIND:10")          //get every user defined curve fit function
-//      list = RemoveFromList("Sum_Model", list  ,";")
-        
+
+        //now start to remove everything the user doesn't need to see...
+                
         tmp = FunctionList("*_proto",";","KIND:10")             //prototypes
         list = RemoveFromList(tmp, list  ,";")
@@ -137 +138 @@
         list = RemoveFromList("NewGF_SetXWaveInList", list)
         list = RemoveFromList("NewGlblFitFuncAAOStruct", list)
+        
+        // more to remove as a result of 2D/Gizmo
+        list = RemoveFromList("A_WMRunLessThanDelta", list)
+        list = RemoveFromList("WMFindNaNValue", list)
+        list = RemoveFromList("WM_Make3DBarChartParametricWave", list)
+        list = RemoveFromList("UpdateQxQy2Mat", list)
+        
 
         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

@@ -144 +144 @@
         
         Label left "I(q)"
-        SVAR angst = root:myGlobals:gAngstStr
         Label bottom "q (A\\S-1\\M)"