Changeset 34c2649 in sasview for sansmodels/src/sans/models/c_models/polygausscoil.cpp

Timestamp:

Nov 21, 2011 4:52:25 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:

1810613

Parents:

afea8fe

Message:

Re #4 Fixed warnings

File:

• sansmodels/src/sans/models/c_models/polygausscoil.cpp (modified) (3 diffs)

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

@@ -67 +67 @@
 
         // Loop over radius weight points
-        for(int i=0; i<weights_rad.size(); i++) {
+        for(size_t i=0; i<weights_rad.size(); i++) {
                 dp[1] = weights_rad[i].value;
 
@@ -117 +117 @@
  */
 double Poly_GaussCoil :: calculate_ER() {
-        PolyGaussCoilParameters dp;
-        dp.scale = scale();
-        dp.rg= rg();
-        dp.poly_m = poly_m();
-        dp.background = background();
         double rad_out = 0.0;
 
@@ -132 +127 @@
         rg.get_weights(weights_rad);
         // Loop over radius weight points to average the radius value
-        for(int i=0; i<weights_rad.size(); i++) {
+        for(size_t i=0; i<weights_rad.size(); i++) {
                 sum += weights_rad[i].weight
                         * weights_rad[i].value;