Changeset 318b5bbb in sasview for sansmodels/include/sphere.h

Timestamp:

Dec 18, 2012 10:55:24 AM (12 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6550b64

Parents:

0203ade

Message:

Added polarization and magnetic stuffs

File:

• sansmodels/include/sphere.h (modified) (1 diff)

sansmodels/include/sphere.h

@@ -18 +18 @@
  //             </text>
  //[FIXED]=  radius.width
- //[ORIENTATION_PARAMS]= <text> </text>
+ //[ORIENTATION_PARAMS]= <text> M0_sld_sph; M_theta_sph; M_phi_sph;M0_sld_solv; M_theta_solv; M_phi_solv; Up_frac_i; Up_frac_f; Up_theta; </text>
+ //[MAGNETIC_PARAMS]= <text> M0_sld_sph; M_theta_sph; M_phi_sph; M0_sld_solv; M_theta_solv; M_phi_solv; Up_frac_i; Up_frac_f; Up_theta; </text>
  //[CATEGORY] = Shapes & Spheres
-
+ 
 class SphereModel{
 public:
-  // Model parameters
-  /// Scale factor
-  //  [DEFAULT]=scale= 1.0
-  Parameter scale;
+        // Model parameters
+        /// Scale factor
+        //  [DEFAULT]=scale= 1.0
+        Parameter scale;
 
-  /// Radius of sphere [A]
-  //  [DEFAULT]=radius=60.0 [A]
-  Parameter radius;
+        /// Radius of sphere [A]
+        //  [DEFAULT]=radius=60.0 [A]
+        Parameter radius;
 
-  /// sldSph [1/A^(2)]
-  //  [DEFAULT]=sldSph= 2.0e-6 [1/A^(2)]
-  Parameter sldSph;
+        /// sldSph [1/A^(2)]
+        //  [DEFAULT]=sldSph= 2.0e-6 [1/A^(2)]
+        Parameter sldSph;
 
-  /// sldSolv [1/A^(2)]
-  //  [DEFAULT]=sldSolv= 1.0e-6 [1/A^(2)]
-  Parameter sldSolv;
+        /// sldSolv [1/A^(2)]
+        //  [DEFAULT]=sldSolv= 1.0e-6 [1/A^(2)]
+        Parameter sldSolv;
 
-/// Incoherent Background [1/cm]
-//  [DEFAULT]=background=0 [1/cm]
-Parameter background;
+        /// Incoherent Background [1/cm]
+        //  [DEFAULT]=background=0 [1/cm]
+        Parameter background;
 
-  // Constructor
-  SphereModel();
+        /// M0_sld_sph
+        //  [DEFAULT]=M0_sld_sph=0.0e-6 [1/A^(2)]
+        Parameter M0_sld_sph;
 
-  // Operators to get I(Q)
-  double operator()(double q);
-  double operator()(double qx, double qy);
-  double calculate_ER();
-  double calculate_VR();
-  double evaluate_rphi(double q, double phi);
+        /// M_theta_sph
+        //  [DEFAULT]=M_theta_sph=0.0 [deg]
+        Parameter M_theta_sph;
+
+        /// M_phi_sph
+        //  [DEFAULT]=M_phi_sph=0.0 [deg]
+        Parameter M_phi_sph;
+
+        /// M0_sld_solv
+        //  [DEFAULT]=M0_sld_solv=0.0e-6 [1/A^(2)]
+        Parameter M0_sld_solv;
+
+        /// M_theta_solv
+        //  [DEFAULT]=M_theta_solv=0.0 [deg]
+        Parameter M_theta_solv;
+
+        /// M_phi_solv
+        //  [DEFAULT]=M_phi_solv=0.0 [deg]
+        Parameter M_phi_solv;
+        
+        /// Up_frac_i
+        //  [DEFAULT]=Up_frac_i=0.5 [u/(u+d)]
+        Parameter Up_frac_i;
+
+        /// Up_frac_f
+        //  [DEFAULT]=Up_frac_f=0.5 [u/(u+d)]
+        Parameter Up_frac_f;
+
+        /// Up_theta
+        //  [DEFAULT]=Up_theta=0.0 [deg]
+        Parameter Up_theta;
+
+
+        // Constructor
+        SphereModel();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double calculate_ER();
+        double calculate_VR();
+        double evaluate_rphi(double q, double phi);
 };