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

Timestamp:

Dec 18, 2012 8: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/parallelepiped.h (modified) (2 diffs)

sansmodels/include/parallelepiped.h

@@ -17 +17 @@
                 </text>
         [FIXED]= <text>short_a.width; short_b.width; long_c.width;parallel_phi.width;parallel_psi.width; parallel_theta.width</text>
-        [ORIENTATION_PARAMS]= <text>parallel_phi;parallel_psi; parallel_theta; parallel_phi.width;parallel_psi.width; parallel_theta.width</text>
-
+        [ORIENTATION_PARAMS]= <text>parallel_phi;parallel_psi; parallel_theta; parallel_phi.width;parallel_psi.width; parallel_theta.width; M0_sld_pipe; M_theta_pipe; M_phi_pipe;M0_sld_solv; M_theta_solv; M_phi_solv; Up_frac_i; Up_frac_f; Up_theta;</text>
+        [MAGNETIC_PARAMS]= <text> M0_sld_pipe; M_theta_pipe; M_phi_pipe; M0_sld_solv; M_theta_solv; M_phi_solv; Up_frac_i; Up_frac_f; Up_theta; </text>
 
  **/
@@ -56 +56 @@
   Parameter parallel_psi;
 
+  /// M0_sld_pipe
+  //  [DEFAULT]=M0_sld_pipe=0.0e-6 [1/A^(2)]
+  Parameter M0_sld_pipe;
+
+  /// M_theta_pipe
+  //  [DEFAULT]=M_theta_pipe=0.0 [deg]
+  Parameter M_theta_pipe;
+
+  /// M_phi_pipe
+  //  [DEFAULT]=M_phi_pipe=0.0 [deg]
+  Parameter M_phi_pipe;
+
+  /// 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
   ParallelepipedModel();