Changeset 82c11d3 in sasview for sansmodels/src/c_models/binaryHS.cpp

Timestamp:

Jan 5, 2012 6:24:51 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

20d91bd

Parents:

98fdccd

Message:

refactored bunch of models

File:

• sansmodels/src/c_models/binaryHS.cpp (modified) (5 diffs)

sansmodels/src/c_models/binaryHS.cpp

@@ -21 +21 @@
 
 #include <math.h>
-#include "models.hh"
 #include "parameters.hh"
 #include <stdio.h>
 using namespace std;
+#include "binaryHS.h"
 
 extern "C" {
-        #include "libSphere.h"
-        #include "binaryHS.h"
+#include "libSphere.h"
 }
 
 BinaryHSModel :: BinaryHSModel() {
 
-        l_radius     = Parameter(160.0, true);
-        l_radius.set_min(0.0);
-        s_radius    = Parameter(25.0, true);
-        s_radius.set_min(0.0);
-        vol_frac_ls  = Parameter(0.2);
-        vol_frac_ss  = Parameter(0.1);
-        ls_sld      = Parameter(3.5e-6);
-        ss_sld     = Parameter(5e-7);
-        solvent_sld   = Parameter(6.36e-6);
-        background = Parameter(0.0);
+  l_radius     = Parameter(160.0, true);
+  l_radius.set_min(0.0);
+  s_radius    = Parameter(25.0, true);
+  s_radius.set_min(0.0);
+  vol_frac_ls  = Parameter(0.2);
+  vol_frac_ss  = Parameter(0.1);
+  ls_sld      = Parameter(3.5e-6);
+  ss_sld     = Parameter(5e-7);
+  solvent_sld   = Parameter(6.36e-6);
+  background = Parameter(0.0);
 }
 
@@ -52 +51 @@
  */
 double BinaryHSModel :: operator()(double q) {
-        double dp[8];
+  double dp[8];
 
-        // Fill parameter array for IGOR library
-        // Add the background after averaging
-        dp[0] = l_radius();
-        dp[1] = s_radius();
-        dp[2] = vol_frac_ls();
-        dp[3] = vol_frac_ss();
-        dp[4] = ls_sld();
-        dp[5] = ss_sld();
-        dp[6] = solvent_sld();
-        dp[7] = 0.0;
+  // Fill parameter array for IGOR library
+  // Add the background after averaging
+  dp[0] = l_radius();
+  dp[1] = s_radius();
+  dp[2] = vol_frac_ls();
+  dp[3] = vol_frac_ss();
+  dp[4] = ls_sld();
+  dp[5] = ss_sld();
+  dp[6] = solvent_sld();
+  dp[7] = 0.0;
 
 
-        // Get the dispersion points for the large radius
-        vector<WeightPoint> weights_l_radius;
-        l_radius.get_weights(weights_l_radius);
+  // Get the dispersion points for the large radius
+  vector<WeightPoint> weights_l_radius;
+  l_radius.get_weights(weights_l_radius);
 
-        // Get the dispersion points for the small radius
-        vector<WeightPoint> weights_s_radius;
-        s_radius.get_weights(weights_s_radius);
+  // Get the dispersion points for the small radius
+  vector<WeightPoint> weights_s_radius;
+  s_radius.get_weights(weights_s_radius);
 
-        // Perform the computation, with all weight points
-        double sum = 0.0;
-        double norm = 0.0;
+  // Perform the computation, with all weight points
+  double sum = 0.0;
+  double norm = 0.0;
 
-        // Loop over larger radius weight points
-        for(int i=0; i< (int)weights_l_radius.size(); i++) {
-                dp[0] = weights_l_radius[i].value;
+  // Loop over larger radius weight points
+  for(int i=0; i< (int)weights_l_radius.size(); i++) {
+    dp[0] = weights_l_radius[i].value;
 
-                // Loop over small radius weight points
-                for(int j=0; j< (int)weights_s_radius.size(); j++) {
-                        dp[1] = weights_s_radius[j].value;
+    // Loop over small radius weight points
+    for(int j=0; j< (int)weights_s_radius.size(); j++) {
+      dp[1] = weights_s_radius[j].value;
 
 
-                        sum += weights_l_radius[i].weight *weights_s_radius[j].weight * BinaryHS(dp, q);
-                        norm += weights_l_radius[i].weight *weights_s_radius[j].weight;
-                }
-        }
-        return sum/norm + background();
+      sum += weights_l_radius[i].weight *weights_s_radius[j].weight * BinaryHS(dp, q);
+      norm += weights_l_radius[i].weight *weights_s_radius[j].weight;
+    }
+  }
+  return sum/norm + background();
 }
 
@@ -101 +100 @@
  */
 double BinaryHSModel :: operator()(double qx, double qy) {
-        double q = sqrt(qx*qx + qy*qy);
-        return (*this).operator()(q);
+  double q = sqrt(qx*qx + qy*qy);
+  return (*this).operator()(q);
 }
 
@@ -113 +112 @@
  */
 double BinaryHSModel :: evaluate_rphi(double q, double phi) {
-        return (*this).operator()(q);
+  return (*this).operator()(q);
 }
 
@@ -121 +120 @@
  */
 double BinaryHSModel :: calculate_ER() {
-        //NOT implemented yet!!!
-        return 0.0;
+  //NOT implemented yet!!!
+  return 0.0;
 }