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

Timestamp:

Nov 8, 2007 11:15:58 AM (15 years ago)

Author:

srkline

Message:

Changes to PlotUtils2D here undo the previous changeset, now correctly setting upt the Qx and Qy waves in the call to FucFit?. 2D fit functions do need to have the parameters in the order specified in the function (cw,zw,xw,yw)

Cylinder2D has been REPLACED with a version that uses a MODIFIED version of the DANSE XOPs that is currently only on my computer... We will need to decide in the near future how we are going to include Mathieu's code into our XOPs.

GizmoCylinder? is a crude display of the cylinder angles as a function of theta and phi. Not automatically included, and needs to be tweaked (a lot) before prime time, but it's at least something.

Location:

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

Files:

• Cylinder_2D.ipf (modified) (10 diffs)
• GizmoCylinder.ipf (added)

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

@@ -12 +12 @@
 // in the same way the 2D SANS data matrix is handled.
 //
-// Nothing is threaded at this point, although I think it needs to be since upon
-// reading of the WM documentation, it looks like only "basic" fit functions (meaning
-// NOT AAO or Struct functions) are automatically threaded during curve fitting.
-//
-//
 
-//Cylinder_2D_Dist()
 
-// this is what Cylinder_2D_Dist() from our XOP is expecting
-//double dist_cylinder_2D(double pars[], double q, double phi) {
-//      SmearCylinderParameters danse_pars;
-//      danse_pars.scale        = pars[0];
-//      danse_pars.radius       = pars[1];
-//      danse_pars.length       = pars[2];
-//      danse_pars.contrast     = pars[3];
-//      danse_pars.background   = pars[4];
-//      danse_pars.cyl_theta    = pars[5];
-//      danse_pars.cyl_phi      = pars[6];
-//      danse_pars.sigma_theta  = pars[7];
-//      danse_pars.sigma_phi    = pars[8];
-//      danse_pars.sigma_radius = pars[9];
-//
-//      return smeared_cylinder_analytical_2D(&danse_pars, q, phi);     
-//      
-//};
+///  REQUIRES DANSE XOP for 2D FUNCTIONS
 
 //
@@ -53 +31 @@
         SetDataFolder $("root:"+str)
         
+        
+        // NOTE THAT THE COEFFICIENTS [N] ARE IN A DIFFERENT ORDER !!!
         // Setup parameter table for model function
-        make/O/T/N=10 parameters_Cyl2D
-        Make/O/D/N=10 coef_Cyl2D
+        make/O/T/N=11 parameters_Cyl2D
+        Make/O/D/N=11 coef_Cyl2D
         coef_Cyl2D[0] = 1.0
         coef_Cyl2D[1] = 20.0
@@ -66 +46 @@
         coef_Cyl2D[8] = 0.0
         coef_Cyl2D[9] = 0.0
-        //NOT THE SAME ORDER AS MATHIEU'S CODE - POLYDISPERSITY OF RADIUS IS IN A DIFFERENT LOCATION FROM
-        // MATHIEU'S CylinderModel
+        coef_Cyl2D[10] = 25
+        //
         parameters_Cyl2D[0] = "Scale"
         parameters_Cyl2D[1] = "Radius"
@@ -75 +55 @@
         parameters_Cyl2D[5] = "Axis Theta"
         parameters_Cyl2D[6] = "Axis Phi"
-        parameters_Cyl2D[7] = "Sigma of polydisp in Theta [rad]"
-        parameters_Cyl2D[8] = "Sigma of polydisp in Phi [rad]"
-        parameters_Cyl2D[9] = "Sigma of polydisp in Radius [A]"
+        
+        parameters_Cyl2D[8] = "Sigma of polydisp in Theta [rad]"                //*****
+        parameters_Cyl2D[9] = "Sigma of polydisp in Phi [rad]"                  //*****
+        parameters_Cyl2D[7] = "Sigma of polydisp in Radius [A]"         //*****
+        
+        parameters_Cyl2D[10] = "number of integration points"
 
         Edit parameters_Cyl2D,coef_Cyl2D                                        
@@ -86 +69 @@
                 
         Variable/G gs_Cyl2D=0
-        gs_Cyl2D := Cylinder2D(coef_Cyl2D,zwave_Cyl2D,ywave_Cyl2D,xwave_Cyl2D)  //AAO 2D calculation
+        gs_Cyl2D := Cylinder2D(coef_Cyl2D,zwave_Cyl2D,xwave_Cyl2D,ywave_Cyl2D)  //AAO 2D calculation
         
         Display ywave_Cyl2D vs xwave_Cyl2D
@@ -111 +94 @@
 End
 
-
 //AAO version, uses XOP if available
 // simply calls the original single point calculation with
@@ -118 +100 @@
 // NON-THREADED IMPLEMENTATION
 //
-//Function Cylinder2D(cw,zw,yw,xw) : FitFunc
-//      Wave cw,zw,yw,xw
+//Function Cylinder2D(cw,zw,xw,yw) : FitFunc
+//      Wave cw,zw,xw,yw
 //      
-//#if exists("Cylinder_2D_Dist")
-//      zw = Cylinder_2D_Dist(cw,xw,yw)
+//#if exists("CylinderModel_D")
+//      zw = CylinderModel_D(cw,xw,yw)
 //#else
 //      Abort "You do not have the SANS Analysis XOP installed"
@@ -131 +113 @@
 
 //threaded version of the function
-ThreadSafe Function Cylinder2D_T(cw,zw,yw,xw,p1,p2)
-        WAVE cw,zw,yw,xw
+ThreadSafe Function Cylinder2D_T(cw,zw,xw,yw,p1,p2)
+        WAVE cw,zw,xw,yw
         Variable p1,p2
         
-#if exists("Cylinder_2D_Dist")                  //to hide the function if XOP not installed
-        zw[p1,p2]= Cylinder_2D_Dist(cw,xw,yw)
+#if exists("CylinderModel_D")                   //to hide the function if XOP not installed
+        zw[p1,p2]= CylinderModel_D(cw,xw,yw)
 #endif
 
@@ -145 +127 @@
 //function that is actually a wrapper to dispatch the calculation to N threads
 //
-Function Cylinder2D(cw,zw,yw,xw) : FitFunc
-        Wave cw,zw,yw,xw
+Function Cylinder2D(cw,zw,xw,yw) : FitFunc
+        Wave cw,zw,xw,yw
         
         Variable npt=numpnts(yw)
@@ -154 +136 @@
         for(i=0;i<nthreads;i+=1)
 //              Print (i*npt/nthreads),((i+1)*npt/nthreads-1)
-                ThreadStart mt,i,Cylinder2D_T(cw,zw,yw,xw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
+                ThreadStart mt,i,Cylinder2D_T(cw,zw,xw,yw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
         endfor