Changeset 230

Timestamp:

Jan 8, 2008 4:59:18 PM (15 years ago)

Author:

srkline

Message:

2D model functions now use the new XOPs named in SANSAnalysis.xop, which now includes the DANSE code. Also added a trivial example of 2D scattering from a sphere.

Location:

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D

Files:

• CoreShellCyl2D.ipf (modified) (2 diffs)
• Cylinder_2D.ipf (modified) (2 diffs)
• Ellipsoid2D.ipf (modified) (2 diffs)
• EllipticalCylinder2D.ipf (modified) (2 diffs)
• Sphere_2D.ipf (added)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D/CoreShellCyl2D.ipf

@@ -125 +125 @@
         Variable p1,p2
         
-#if exists("CoreShellCylinderModel_D")                  //to hide the function if XOP not installed
+#if exists("CoreShellCylinder_2DX")                     //to hide the function if XOP not installed
 
         Make/O/D/N=15 CSCyl2D_tmp
@@ -132 +132 @@
         CSCyl2D_tmp[7] = 0              //send a zero background to the calculation, add it in later
 
-        zw[p1,p2]= CoreShellCylinderModel_D(CSCyl2D_tmp,xw,yw) + cw[7]
+        zw[p1,p2]= CoreShellCylinder_2DX(CSCyl2D_tmp,xw,yw) + cw[7]
         
 #endif

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D/Cylinder_2D.ipf

@@ -121 +121 @@
         Variable p1,p2
         
-#if exists("CylinderModel_D")                   //to hide the function if XOP not installed
+#if exists("Cylinder_2DX")                      //to hide the function if XOP not installed
 
         Make/O/D/N=11 Cyl2D_tmp                         // there seems to be no speed penalty for doing this...
@@ -128 +128 @@
         Cyl2D_tmp[4] = 0                                                // send a background of zero
         
-        zw[p1,p2]= CylinderModel_D(Cyl2D_tmp,xw,yw) + cw[4]             //add in the proper background here
+        zw[p1,p2]= Cylinder_2DX(Cyl2D_tmp,xw,yw) + cw[4]                //add in the proper background here
 
 #endif

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D/Ellipsoid2D.ipf

@@ -124 +124 @@
         Variable p1,p2
         
-#if exists("EllipsoidModel_D")                  //to hide the function if XOP not installed
+#if exists("Ellipsoid_2DX")                     //to hide the function if XOP not installed
 
         Make/O/D/N=12 Ellip2D_tmp
@@ -131 +131 @@
         Ellip2D_tmp[4] = 0              //pass in a zero background and add it in later
         
-        zw[p1,p2]= EllipsoidModel_D(Ellip2D_tmp,xw,yw) + cw[4]
+        zw[p1,p2]= Ellipsoid_2DX(Ellip2D_tmp,xw,yw) + cw[4]
         
 #endif

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D/EllipticalCylinder2D.ipf

@@ -125 +125 @@
         Variable p1,p2
         
-#if exists("EllipticalCylinderModel_D")                 //to hide the function if XOP not installed
+#if exists("EllipticalCylinder_2DX")                    //to hide the function if XOP not installed
 
         Make/O/D/N=14 EllCyl2D_tmp
@@ -132 +132 @@
         EllCyl2D_tmp[5] = 0             //pass in a zero background and add it in later
         
-        zw[p1,p2]= EllipticalCylinderModel_D(EllCyl2D_tmp,xw,yw) + cw[5]
+        zw[p1,p2]= EllipticalCylinder_2DX(EllCyl2D_tmp,xw,yw) + cw[5]
         
 #endif