Changeset 2e2452b in sasview for sansmodels/src/sans

Timestamp:

Dec 9, 2011 5:15:40 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:

2371363

Parents:

0e8b249

Message:

Re #4 Fix a bunch of model warnings

Location:

sansmodels/src/sans/models

Files:

• c_extensions/CGaussian.c (modified) (1 diff)
• c_extensions/CLogNormal.c (modified) (1 diff)
• c_extensions/CLorentzian.c (modified) (1 diff)
• c_extensions/CSchulz.c (modified) (1 diff)
• c_models/DiamCyl.cpp (modified) (1 diff)
• c_smearer/smearer.cpp (modified) (5 diffs)

sansmodels/src/sans/models/c_extensions/CGaussian.c

@@ -267 +267 @@
 
 
-static PyMethodDef module_methods[] = {
-    {NULL} 
-};
+//static PyMethodDef module_methods[] = {
+//    {NULL}
+//};
 
 /**

sansmodels/src/sans/models/c_extensions/CLogNormal.c

@@ -267 +267 @@
 
 
-static PyMethodDef module_methods[] = {
-    {NULL} 
-};
+//static PyMethodDef module_methods[] = {
+//    {NULL}
+//};
 
 /**

sansmodels/src/sans/models/c_extensions/CLorentzian.c

@@ -267 +267 @@
 
 
-static PyMethodDef module_methods[] = {
-    {NULL} 
-};
+//static PyMethodDef module_methods[] = {
+//    {NULL}
+//};
 
 /**

sansmodels/src/sans/models/c_extensions/CSchulz.c

@@ -267 +267 @@
 
 
-static PyMethodDef module_methods[] = {
-    {NULL} 
-};
+//static PyMethodDef module_methods[] = {
+//    {NULL}
+//};
 
 /**

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

@@ -66 +66 @@
 
         // 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[0] = weights_rad[i].value;
                 // Loop over length weight points
-                for(int j=0; j<weights_len.size(); j++) {
+                for(size_t j=0; j<weights_len.size(); j++) {
                         dp[1] = weights_len[j].value;
 

sansmodels/src/sans/models/c_smearer/smearer.cpp

@@ -169 +169 @@
                 // Find Weights
                 // Find q where the resolution smearing calculation of I(q) occurs
-                double q, q_min, q_max, q_0;
+                double q, q_min, q_max, q_0=0.0;
                 get_bin_range(i, &q, &q_min, &q_max);
                 // Block q becomes <=0
@@ -175 +175 @@
                         continue;
                 }
-                bool last_qpoint = true;
                 // Find q[0] value to normalize the weight later,
                 //  otherwise, we will have a precision problem.
@@ -182 +181 @@
                 }
                 // Loop over all qj-values
-                bool first_w = true;
                 for(int j=0; j<nbins; j++) {
                         double q_j, q_high, q_low;
@@ -263 +261 @@
                                                 // Later, it will be normalized again.
 
-                                                double q_shift_min = q - width;
-
-                                                double u = (q_j * q_j - (q_shift) * (q_shift));
                                                 // The fabs below are not necessary but in case: the weight should never be imaginary.
                                                 // At the edge of each sub_width. weight += u(at q_high bin) - u(0), where u(0) = 0,
@@ -292 +287 @@
 
         // Loop over all q-values
-        double step = (qmax-qmin)/((double)nbins-1.0);
         double q, q_min, q_max;
         double q_j, q_jmax, q_jmin;