Changeset 325bc4a in sasview for sansmodels/src/c_models

Timestamp:

Jul 16, 2012 4:11:09 AM (12 years ago)

Author:

Robert Whitley <robert.whitley@…>

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:

dc9660d

Parents:

0da4eba

Message:

Refs 84. Fix build servers.

File:

• sansmodels/src/c_models/GelFit.cpp (modified) (6 diffs)

sansmodels/src/c_models/GelFit.cpp

@@ -27 +27 @@
 #include "GelFit.h"
 
-typedef struct {
-  double lScale;
-  double gScale;
-  double zeta;
-  double radius;
-  double scale;
-  double background;
-}
-
-GelFitModel :: GelFitModel()
+GelFitModel::GelFitModel()
 {
     lScale = Parameter(3.5);
@@ -47 +38 @@
 }
 
-double GelFitModel :: operator()(double q) 
+double GelFitModel::operator()(double q) 
 {
     double dp[3];
@@ -74 +65 @@
         
         // Scattering Law
-        ///////////////////////////////ycal[j] = ((lScale/c) + (gScale*f) + bkgd);
-    return ((lScale()/c) + (gScale()*f) + background());
+    double result((lScale()/c) + (gScale()*f) + background());
+    return result;
 }
 
@@ -85 +76 @@
  * @return: function value
  */
-double GelFitModel :: operator()(double qx, double qy) 
+double GelFitModel::operator()(double qx, double qy) 
 {
   double q = sqrt(qx*qx + qy*qy);
@@ -98 +89 @@
  * @return: function value
  */
-double GelFitModel :: evaluate_rphi(double q, double phi) 
+double GelFitModel::evaluate_rphi(double q, double phi) 
 {
   double qx = q*cos(phi);
@@ -108 +99 @@
  * @return: effective radius value
  */
-double GelFitModel :: calculate_ER() 
+double GelFitModel::calculate_ER() 
 {
   //NOT implemented yet!!!
   return 0.0;
 }
-double GelFitModel :: calculate_VR() 
+double GelFitModel::calculate_VR() 
 {
   return 1.0;