Changeset 515 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models

Timestamp:

Jun 23, 2009 6:06:24 PM (14 years ago)

Author:

srkline

Message:

A bunch of random changes:
-SASCALC - added the 2.5 cm aperture NG3/7g/polarizer back in, but made the 5 cm the default
-Some fiddling with 2D functionality to enable 2D resolution smearing. Still a work in progress
-Added two new model functions, and added them to the list.
-Changes to the wrapper for the new release to generate kw=val strings as needed for each function
and its coefficients and parameters. This behavior has been changed in the new release, so this
fix should keep old analysis experiments compatible with the new version.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models

Files:

• Models_2D/PeakGauss2D_v40.ipf (added)
• Models_2D/Sphere_2D_v40.ipf (modified) (2 diffs)
• NewModels_2008/GaussLorentzGel_v40.ipf (modified) (1 diff)
• NewModels_2008/SC_ParaCrystal_v40.ipf (modified) (1 diff)
• NewModels_2009/Fractal_PolyCore_v40.ipf (added)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Models_2D/Sphere_2D_v40.ipf

@@ -157 +157 @@
 
 
-//threaded version of the function
+//non-threaded version of the function
 Function Sphere2D_noThread(cw,zw,xw,yw)
         WAVE cw,zw, xw,yw
@@ -170 +170 @@
 End
 
-
+// I think I did this because when I do the quadrature loops I'm calling the AAO with 1-pt waves, so threading
+// would just be a slowdown
 Function SmearedSphere2D(s)
         Struct ResSmear_2D_AAOStruct &s

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/GaussLorentzGel_v40.ipf

@@ -5 +5 @@
 //
 // Reference:G. Evmenenko, E. Theunissedn, K. Mortensen, H. Reynaers
-//                                      Polymer 42 (2001) 2907-2913.
+//                                      Polymer 42 (2001) 2907-2913. (equation 5)
 //
+//              see also: Hecht, Horkay, Geissler, PHYSICAL REVIEW E, VOLUME 64, 041402 (eqn 1)
 //
 // Steve Kline 14 JUL 2004 (for Robert Knott)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/SC_ParaCrystal_v40.ipf

@@ -136 +136 @@
         gg = w[2] //Paracrystal distortion factor
         Rad = w[3] //Sphere radius
-        contrast = w[4] //SLD contrast 
-        background = w[5] 
+        contrast = w[4] - w[5] //SLD contrast 
+        background = w[6] 
                 
 // always calculate for type 0, SC