Changeset 8e36cdd in sasview for sansmodels/src/sans/models/c_extensions/parallelepiped.h

Timestamp:

Aug 20, 2009 1:24:23 PM (15 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:

1d67243

Parents:

191b369

Message:

fixed and tested ppmodel 2d and cleaned it up.

File:

• sansmodels/src/sans/models/c_extensions/parallelepiped.h (modified) (2 diffs)

sansmodels/src/sans/models/c_extensions/parallelepiped.h

@@ -7 +7 @@
 /** Structure definition for Parallelepiped parameters
  * [PYTHONCLASS] = ParallelepipedModel
- * [DISP_PARAMS] = short_a, long_b, longer_c,parallel_phi,parallel_psi, parallel_theta
+ * [DISP_PARAMS] = short_a, short_b, long_c,parallel_phi,parallel_psi, parallel_theta
    [DESCRIPTION] = <text> Form factor for a rectangular solid with uniform scattering length density.
 
                 scale:Scale factor
-                short_a: length of short side of the parallelepiped [A]
-                long_b: length of long side of the parallelepiped [A]
-                longer_c: length of longer side of the parallelepiped [A]
+                short_a: length of short edge  [A]
+                short_b: length of another short edge [A]
+                long_c: length of long edge  of the parallelepiped [A]
                 contrast: particle_sld - solvent_sld
                 background:Incoherent Background [1/cm]
                 </text>
-        [FIXED]= <text>short_a.width; long_b.width; longer_c.width;parallel_phi.width;parallel_psi.width; parallel_theta.width</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>
 
@@ -26 +26 @@
     //  [DEFAULT]=scale=1.0
     double scale;
-    ///  Length of short side of the parallelepiped [A]
+    ///  Length of short edge of the parallelepiped [A]
     //  [DEFAULT]=short_a=35 [A]
     double short_a;
-        /// Length of long side edge of the parallelepiped [A]
-    //  [DEFAULT]=long_b=75 [A]
-    double long_b;
-        /// Length of longer side of the parallelepiped [A]
-    //  [DEFAULT]=longer_c=400 [A]
-    double longer_c;
+        /// Length of short edge edge of the parallelepiped [A]
+    //  [DEFAULT]=short_b=75 [A]
+    double short_b;
+        /// Length of long edge of the parallelepiped [A]
+    //  [DEFAULT]=long_c=400 [A]
+    double long_c;
     /// Contrast [1/A²]
     //  [DEFAULT]=contrast=5.3e-6 [1/A²]