Changeset 97eed48 in sasview

Timestamp:

Apr 4, 2014 6:55:26 AM (11 years ago)

Author:

Tobias Richter <tobias.richter@…>

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:

4651383

Parents:

64aa49e

Message:

refs #4 - reduce C/C++ warnings

Location:

src/sans

Files:

• models/c_extension/c_models/schulz.cpp (modified) (1 diff)
• pr/c_extensions/Cinvertor.c (modified) (6 diffs)

src/sans/models/c_extension/c_models/schulz.cpp

@@ -29 +29 @@
 }
 
-/**
- * Function to evaluate 1D scattering function
 /**
  * Function to evaluate 1D Schulz function.

src/sans/pr/c_extensions/Cinvertor.c

@@ -509 +509 @@
         // Regularization factor
         double regterm = 0.0;
-        double tmp = 0.0;
         // Number of slices in regularization term estimate
         int nslice = 25;
@@ -529 +528 @@
         diff = self->params.y[i] - iq(pars, self->params.d_max, npars, self->params.x[i]);
         residual = diff*diff / (self->params.err[i]*self->params.err[i]);
-        tmp = residual;
 
         // regularization term
@@ -539 +537 @@
                 return NULL;
         };
-
     }
-
         return residuals;
 }
@@ -564 +560 @@
         // Regularization factor
         double regterm = 0.0;
-        double tmp = 0.0;
         // Number of slices in regularization term estimate
         int nslice = 25;
@@ -584 +579 @@
         diff = self->params.y[i] - pr(pars, self->params.d_max, npars, self->params.x[i]);
         residual = diff*diff / (self->params.err[i]*self->params.err[i]);
-        tmp = residual;
 
         // regularization term
@@ -594 +588 @@
                 return NULL;
         };
-
     }
-
         return residuals;
 }