Changeset 112 for sans/Analysis/branches

Timestamp:

May 9, 2007 4:33:54 PM (16 years ago)

Author:

ajj

Message:

Added 2D Cylinder function from M Doucet to library and to XOP code.

Call in IGOR as Output = Cylinder_2D_Dist(params,Q_x[p],Q_y[q])

Call in C as dist_cylinder_2D(params,qx,qy)

Location:

sans/Analysis/branches/ajj_23APR07/XOPs/SANSAnalysis

Files:

• XOP/Func2D.c (added)
• XOP/SANSAnalysis.c (modified) (2 diffs)
• XOP/SANSAnalysis.h (modified) (1 diff)
• XOP/SANSAnalysis.r (modified) (1 diff)
• lib/libFunc2D.c (added)
• lib/libFunc2D.h (added)
• lib/libSANSAnalysis.h (modified) (1 diff)

sans/Analysis/branches/ajj_23APR07/XOPs/SANSAnalysis/XOP/SANSAnalysis.c

@@ -17 +17 @@
 #include "StructureFactor.h"
 #include "ResolutionSmearing.h"
+#include "Func2D.h"
 
 static long
@@ -215 +216 @@
                 case 58:                                                        // y =Smear_Model_76_X (utility).
                         return((long)SmearedCyl_PolyRadiusX);                   // This function is called using the direct method.
+                        break;  
+                case 59:                                                        // y =Smear_Model_76_X (utility).
+                        return((long)Cylinder_2D_Dist);                 // This function is called using the direct method.
                         break;  
         }

sans/Analysis/branches/ajj_23APR07/XOPs/SANSAnalysis/XOP/SANSAnalysis.h

@@ -19 +19 @@
 }FitParams, *FitParamsPtr;
 
+// Fit function parameter structure
+typedef struct FitParams2D {
+        double qy;                              // Independent variable.
+        double qx;                              // Independent variable.
+        waveHndl waveHandle;    // Coefficient wave.
+        double result;
+}FitParams2D, *FitParams2DPtr;
 

sans/Analysis/branches/ajj_23APR07/XOPs/SANSAnalysis/XOP/SANSAnalysis.r

@@ -531 +531 @@
                 },
 
+                "Cylinder_2D_Dist",
+                F_UTIL | F_EXTERNAL,                                    /* function category == UTILITY */
+                NT_FP64,                                                /* return value type */                 
+                {
+                        NT_FP64 + WAVE_TYPE,                            /* double precision wave (coefficient wave) */
+                        NT_FP64,                                        /* double precision x */
+                        NT_FP64,                                        /* double precision x */
+                },
+
+
         }
 };

sans/Analysis/branches/ajj_23APR07/XOPs/SANSAnalysis/lib/libSANSAnalysis.h

@@ -107 +107 @@
 double FourLevel(double dp[], double q);
 
+
+typedef struct {
+    double scale;
+    double radius;
+    double length;
+    double contrast;
+        double background;    
+    double cyl_theta;
+    double cyl_phi;    
+} CylinderParameters;
+
+typedef struct {
+    double scale;
+    double radius;
+    double length;
+    double contrast;
+        double background;
+    double cyl_theta;
+    double cyl_phi; 
+    double sigma_theta;
+    double sigma_phi;
+    double sigma_radius;
+} SmearCylinderParameters;
+
+/// 1D scattering function
+double cylinder_analytical_1D(CylinderParameters *pars, double q);
+/// 2D scattering function
+double cylinder_analytical_2D(CylinderParameters *pars, double q, double phi);
+/// 1D scattering function
+double smeared_cylinder_analytical_1D(SmearCylinderParameters *pars, double q);
+/// 2D scattering function
+double dist_cylinder_2D(double pars[], double q, double phi);
+double smeared_cylinder_analytical_2D(SmearCylinderParameters *pars, double q, double phi);
+double smeared_cylinder_dist( double x, double mean, double sigma );