Changeset aae7a8d in sasview

Timestamp:

Mar 11, 2011 10:55:53 AM (14 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:

b2d9826

Parents:

ae4ade7

Message:

added constraint on leastsq/Scipy

Location:

sansmodels/src/sans/models/c_models

Files:

• refl.cpp (modified) (1 diff)
• refl_adv.cpp (modified) (1 diff)

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

@@ -145 +145 @@
  */
 double ReflModel :: operator()(double qx, double qy) {
-        double q = sqrt(qx*qx + qy*qy);
+        // For 2D set qy as q, ignoring qx.
+        double q = qy;//sqrt(qx*qx + qy*qy);
+        if (q < 0.0){
+                return 0.0;
+        }
         return (*this).operator()(q);
 }

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

@@ -197 +197 @@
  */
 double ReflAdvModel :: operator()(double qx, double qy) {
-        double q = sqrt(qx*qx + qy*qy);
+        // For 2D set qy as q, ignoring qx.
+        double q = qy;//sqrt(qx*qx + qy*qy);
+        if (q < 0.0){
+                return 0.0;
+        }
         return (*this).operator()(q);
 }