Changeset f8644dd in sasview for sansmodels/src/c_models/dabmodel.cpp

Timestamp:

Jul 9, 2012 9:57:01 AM (12 years ago)

Author:

Kieran Campbell <kieranrcampbell@…>

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:

14e4804

Parents:

a269378

Message:

Fixed calculation functions to pass unit tests

File:

• sansmodels/src/c_models/dabmodel.cpp (modified) (1 diff)

sansmodels/src/c_models/dabmodel.cpp

@@ -47 +47 @@
 
 double DABModel::calculate_ER() {
+  // not implemented yet
   return 0.0;
 }
 
 double DABModel::calculate_VR() {
-  return 0.0;
+  return 1.0;
 }
 
 double DABModel::evaluate_rphi(double q,double phi) {
-  return 1.0;
+  double qx = q * cos(phi);
+  double qy = q * sin(phi);
+  return this->operator()(qx,qy);
 }