Changeset 3c102d4 in sasview for sansmodels/src/sans/models/c_models

Timestamp:

Aug 18, 2009 1:56:49 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:

eddff027

Parents:

7d11b81

Message:

fixed problems in 2d

Location:

sansmodels/src/sans/models/c_models

Files:

• CTriaxialEllipsoidModel.cpp (modified) (1 diff)
• parallelepiped.cpp (modified) (8 diffs)
• triaxialellipsoid.cpp (modified) (3 diffs)

sansmodels/src/sans/models/c_models/CTriaxialEllipsoidModel.cpp

@@ -88 +88 @@
         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000));
         PyDict_SetItemString(self->params,"axis_psi",Py_BuildValue("d",0.000000));
-        PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",0.000000));
-        PyDict_SetItemString(self->params,"semi_axisA",Py_BuildValue("d",100.000000));
-        PyDict_SetItemString(self->params,"semi_axisB",Py_BuildValue("d",35.000000));
+        PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",1.000000));
+        PyDict_SetItemString(self->params,"semi_axisA",Py_BuildValue("d",35.000000));
+        PyDict_SetItemString(self->params,"semi_axisB",Py_BuildValue("d",100.000000));
         PyDict_SetItemString(self->params,"semi_axisC",Py_BuildValue("d",400.000000));
-        PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",0.000000));
+        PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",1.000000));
         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000));
         PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.000005));

sansmodels/src/sans/models/c_models/parallelepiped.cpp

@@ -35 +35 @@
 ParallelepipedModel :: ParallelepipedModel() {
         scale      = Parameter(1.0);
-        short_edgeA     = Parameter(35.0, true);
-        short_edgeA.set_max(1.0);
-        longer_edgeB     = Parameter(75.0, true);
-        longer_edgeB.set_min(1.0);
-        longuest_edgeC     = Parameter(400.0, true);
-        longuest_edgeC.set_min(1.0);
+        short_a     = Parameter(35.0, true);
+        short_a.set_max(1.0);
+        long_b     = Parameter(75.0, true);
+        long_b.set_min(1.0);
+        longer_c     = Parameter(400.0, true);
+        longer_c.set_min(1.0);
         contrast   = Parameter(53.e-7);
         background = Parameter(0.0);
@@ -60 +60 @@
         // Add the background after averaging
         dp[0] = scale();
-        dp[1] = short_edgeA();
-        dp[2] = longer_edgeB();
-        dp[3] = longuest_edgeC();
+        dp[1] = short_a();
+        dp[2] = long_b();
+        dp[3] = longer_c();
         dp[4] = contrast();
         dp[5] = 0.0;
 
         // Get the dispersion points for the short_edgeA
-        vector<WeightPoint> weights_short_edgeA;
-        short_edgeA.get_weights(weights_short_edgeA);
+        vector<WeightPoint> weights_short_a;
+        short_a.get_weights(weights_short_a);
 
         // Get the dispersion points for the longer_edgeB
-        vector<WeightPoint> weights_longer_edgeB;
-        longer_edgeB.get_weights(weights_longer_edgeB);
+        vector<WeightPoint> weights_long_b;
+        long_b.get_weights(weights_long_b);
 
         // Get the dispersion points for the longuest_edgeC
-        vector<WeightPoint> weights_longuest_edgeC;
-        longuest_edgeC.get_weights(weights_longuest_edgeC);
+        vector<WeightPoint> weights_longer_c;
+        longer_c.get_weights(weights_longer_c);
 
 
@@ -85 +85 @@
 
         // Loop over short_edgeA weight points
-        for(int i=0; i< (int)weights_short_edgeA.size(); i++) {
-                dp[1] = weights_short_edgeA[i].value;
+        for(int i=0; i< (int)weights_short_a.size(); i++) {
+                dp[1] = weights_short_a[i].value;
 
                 // Loop over longer_edgeB weight points
-                for(int j=0; j< (int)weights_longer_edgeB.size(); j++) {
-                        dp[2] = weights_longer_edgeB[i].value;
+                for(int j=0; j< (int)weights_long_b.size(); j++) {
+                        dp[2] = weights_long_b[j].value;
 
                         // Loop over longuest_edgeC weight points
-                        for(int k=0; k< (int)weights_longuest_edgeC.size(); k++) {
-                                dp[3] = weights_longuest_edgeC[j].value;
-
-                                sum += weights_short_edgeA[i].weight * weights_longer_edgeB[j].weight
-                                        * weights_longuest_edgeC[k].weight * Parallelepiped(dp, q);
-
-                                norm += weights_short_edgeA[i].weight
-                                         * weights_longer_edgeB[j].weight * weights_longuest_edgeC[k].weight;
+                        for(int k=0; k< (int)weights_longer_c.size(); k++) {
+                                dp[3] = weights_longer_c[k].value;
+
+                                sum += weights_short_a[i].weight * weights_long_b[j].weight
+                                        * weights_longer_c[k].weight * Parallelepiped(dp, q);
+
+                                norm += weights_short_a[i].weight
+                                         * weights_long_b[j].weight * weights_longer_c[k].weight;
                         }
                 }
@@ -116 +116 @@
         // Fill parameter array
         dp.scale      = scale();
-        dp.short_edgeA   = short_edgeA();
-        dp.longer_edgeB   = longer_edgeB();
-        dp.longuest_edgeC  = longuest_edgeC();
+        dp.short_a   = short_a();
+        dp.long_b   = long_b();
+        dp.longer_c  = longer_c();
         dp.contrast   = contrast();
         dp.background = 0.0;
@@ -128 +128 @@
 
         // Get the dispersion points for the short_edgeA
-        vector<WeightPoint> weights_short_edgeA;
-        short_edgeA.get_weights(weights_short_edgeA);
+        vector<WeightPoint> weights_short_a;
+        short_a.get_weights(weights_short_a);
 
         // Get the dispersion points for the longer_edgeB
-        vector<WeightPoint> weights_longer_edgeB;
-        longer_edgeB.get_weights(weights_longer_edgeB);
+        vector<WeightPoint> weights_long_b;
+        long_b.get_weights(weights_long_b);
 
         // Get angular averaging for the longuest_edgeC
-        vector<WeightPoint> weights_longuest_edgeC;
-        longuest_edgeC.get_weights(weights_longuest_edgeC);
+        vector<WeightPoint> weights_longer_c;
+        longer_c.get_weights(weights_longer_c);
 
         // Get angular averaging for theta
@@ -156 +156 @@
 
         // Loop over radius weight points
-        for(int i=0; i< (int)weights_short_edgeA.size(); i++) {
-                dp.short_edgeA = weights_short_edgeA[i].value;
+        for(int i=0; i< (int)weights_short_a.size(); i++) {
+                dp.short_a = weights_short_a[i].value;
 
                 // Loop over longer_edgeB weight points
-                for(int j=0; j< (int)weights_longer_edgeB.size(); j++) {
-                        dp.longer_edgeB = weights_longer_edgeB[j].value;
+                for(int j=0; j< (int)weights_long_b.size(); j++) {
+                        dp.long_b = weights_long_b[j].value;
 
                         // Average over longuest_edgeC distribution
-                        for(int k=0; k< (int)weights_longuest_edgeC.size(); k++) {
-                                dp.longuest_edgeC = weights_longuest_edgeC[k].value;
+                        for(int k=0; k< (int)weights_longer_c.size(); k++) {
+                                dp.longer_c = weights_longer_c[k].value;
 
                                 // Average over theta distribution
@@ -179 +179 @@
                                                         dp.parallel_psi = weights_parallel_psi[n].value;
 
-                                                        double _ptvalue = weights_short_edgeA[i].weight
-                                                                * weights_longer_edgeB[j].weight
-                                                                * weights_longuest_edgeC[k].weight
+                                                        double _ptvalue = weights_short_a[i].weight
+                                                                * weights_long_b[j].weight
+                                                                * weights_longer_c[k].weight
                                                                 * weights_parallel_theta[l].weight
                                                                 * weights_parallel_phi[m].weight
@@ -191 +191 @@
                                                         sum += _ptvalue;
 
-                                                        norm += weights_short_edgeA[i].weight
-                                                                * weights_longer_edgeB[j].weight
-                                                                * weights_longuest_edgeC[k].weight
+                                                        norm += weights_short_a[i].weight
+                                                                * weights_long_b[j].weight
+                                                                * weights_longer_c[k].weight
                                                                 * weights_parallel_theta[l].weight
                                                                 * weights_parallel_phi[m].weight

sansmodels/src/sans/models/c_models/triaxialellipsoid.cpp

@@ -34 +34 @@
 TriaxialEllipsoidModel :: TriaxialEllipsoidModel() {
         scale      = Parameter(1.0);
-        semi_axisA     = Parameter(20.0, true);
+        semi_axisA     = Parameter(35.0, true);
         semi_axisA.set_min(0.0);
-        semi_axisB     = Parameter(20.0, true);
+        semi_axisB     = Parameter(100.0, true);
         semi_axisB.set_min(0.0);
         semi_axisC  = Parameter(400.0, true);
@@ -42 +42 @@
         contrast   = Parameter(5.3e-6);
         background = Parameter(0.0);
-        axis_theta  = Parameter(0.0, true);
-        axis_phi    = Parameter(0.0, true);
+        axis_theta  = Parameter(1.0, true);
+        axis_phi    = Parameter(1.0, true);
         axis_psi    = Parameter(0.0, true);
 }
@@ -190 +190 @@
                                                                 * weights_theta[l].weight
                                                                 * weights_phi[m].weight
-                                                                * weights_psi[m].weight;
+                                                                * weights_psi[n].weight;
                                                 }
                                         }