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

Timestamp:

Nov 7, 2007 5:11:32 PM (15 years ago)

Author:

srkline

Message:

bits and tweaks to get 2D fitting to work. Most significant changes are the call to the 2D AAO function in the correct XY order and the FuncFit? /X={} flag which needs to be {y,x} rather than the expected {x,y}

File:

• sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D/Cylinder_2D.ipf (modified) (3 diffs)

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

@@ -66 +66 @@
         coef_Cyl2D[8] = 0.0
         coef_Cyl2D[9] = 0.0
-        //NOT THE SAME ORDER AS MATHIEU'S CODE
+        //NOT THE SAME ORDER AS MATHIEU'S CODE - POLYDISPERSITY OF RADIUS IS IN A DIFFERENT LOCATION FROM
+        // MATHIEU'S CylinderModel
         parameters_Cyl2D[0] = "Scale"
         parameters_Cyl2D[1] = "Radius"
@@ -121 +122 @@
 //      
 //#if exists("Cylinder_2D_Dist")
-//      zw = Cylinder_2D_Dist(cw,yw,xw)
+//      zw = Cylinder_2D_Dist(cw,xw,yw)
 //#else
 //      Abort "You do not have the SANS Analysis XOP installed"
@@ -134 +135 @@
         Variable p1,p2
         
-        zw[p1,p2]= Cylinder_2D_Dist(cw,yw,xw)
+#if exists("Cylinder_2D_Dist")                  //to hide the function if XOP not installed
+        zw[p1,p2]= Cylinder_2D_Dist(cw,xw,yw)
+#endif
 
 //      return stopMSTimer(-2)          // time when we finished