Changeset 202

Timestamp:

Nov 15, 2007 4:53:40 PM (15 years ago)

Author:

srkline

Message:

Re-wrapped the DANSE XOP calls to pass a zero background so that all of the averages are correct. The background value is added in after the XOP call. Ideally the XOP should be changed to do this internally, but rather than waiting, we'll proceed this path.

Location:

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

Files:

• CoreShellCyl2D.ipf (modified) (1 diff)
• Cylinder_2D.ipf (modified) (1 diff)
• Ellipsoid2D.ipf (modified) (1 diff)
• EllipticalCylinder2D.ipf (modified) (1 diff)

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

@@ -130 +130 @@
         CSCyl2D_tmp = cw
         CSCyl2D_tmp[14] = 25
+        CSCyl2D_tmp[7] = 0              //send a zero background to the calculation, add it in later
 
-        zw[p1,p2]= CoreShellCylinderModel_D(CSCyl2D_tmp,xw,yw)
+        zw[p1,p2]= CoreShellCylinderModel_D(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

@@ -126 +126 @@
         Cyl2D_tmp = cw
         Cyl2D_tmp[10] = 25                                      // hard-wire the number of integration points
+        Cyl2D_tmp[4] = 0                                                // send a background of zero
         
-        zw[p1,p2]= CylinderModel_D(Cyl2D_tmp,xw,yw)
+        zw[p1,p2]= CylinderModel_D(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

@@ -129 +129 @@
         Ellip2D_tmp = cw
         Ellip2D_tmp[11] = 25
+        Ellip2D_tmp[4] = 0              //pass in a zero background and add it in later
         
-        zw[p1,p2]= EllipsoidModel_D(Ellip2D_tmp,xw,yw)
+        zw[p1,p2]= EllipsoidModel_D(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

@@ -130 +130 @@
         EllCyl2D_tmp = cw
         EllCyl2D_tmp[13] = 25
+        EllCyl2D_tmp[5] = 0             //pass in a zero background and add it in later
         
-        zw[p1,p2]= EllipticalCylinderModel_D(EllCyl2D_tmp,xw,yw)
+        zw[p1,p2]= EllipticalCylinderModel_D(EllCyl2D_tmp,xw,yw) + cw[5]
         
 #endif