Changeset 1b758b3 in sasview

Timestamp:

Jan 6, 2012 12:15:18 PM (12 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:

ee0f3fc

Parents:

886dde6b

Message:

clean up warnings

Location:

sansmodels/src

Files:

• c_models/librefl.c (modified) (8 diffs)
• python_wrapper/WrapperGenerator.py (modified) (2 diffs)

sansmodels/src/c_models/librefl.c

@@ -151 +151 @@
 // ind = x position: 0 to max
 // nu = max x to integration
-double err_mod_func(n_sub, ind, nu)
-        double n_sub,nu, ind;
+double err_mod_func(double n_sub, double ind, double nu)
 {
   double center, func;
@@ -177 +176 @@
         return func;
 }
-double linearfunc(n_sub, ind, nu)
-        double n_sub,nu, ind;
+double linearfunc(double n_sub, double ind, double nu)
 {
   double bin_size, func;
@@ -192 +190 @@
 }
 // use the right hand side from the center of power func
-double power_r(n_sub, ind, nu)
-        double n_sub, nu, ind;
+double power_r(double n_sub, double ind, double nu)
 {
   double bin_size,func;
@@ -209 +206 @@
 }
 // use the left hand side from the center of power func
-double power_l(n_sub, ind, nu)
-        double n_sub, nu, ind;
+double power_l(double n_sub, double ind, double nu)
 {
   double bin_size, func;
@@ -226 +222 @@
 }
 // use 1-exp func from x=0 to x=1
-double exp_r(n_sub, ind, nu)
-        double n_sub, nu, ind;
+double exp_r(double n_sub, double ind, double nu)
 {
   double bin_size, func;
@@ -247 +242 @@
 
 // use the left hand side mirror image of exp func
-double exp_l(n_sub, ind, nu)
-        double n_sub, nu, ind;
+double exp_l(double n_sub, double ind, double nu)
 {
   double bin_size, func;
@@ -269 +263 @@
 // To select function called
 // At nu = 0 (singular point), call line function
-double intersldfunc(fun_type, n_sub, i, nu, sld_l, sld_r)
-        double n_sub, nu, sld_l, sld_r,i;
-        int fun_type;
+double intersldfunc(int fun_type, double n_sub, double i, double nu, double sld_l, double sld_r)
 {
         double sld_i, func;
@@ -315 +307 @@
 
 // used by refl.c
-double interfunc(fun_type, n_sub, i, sld_l, sld_r)
-        double n_sub, sld_l, sld_r, i;
-        int fun_type;
+double interfunc(int fun_type, double n_sub, double i, double sld_l, double sld_r)
 {
         double sld_i, func;

sansmodels/src/python_wrapper/WrapperGenerator.py

@@ -323 +323 @@
                     (par, self.params[par])
 
-            param_str += "        // Initialize dispersion / averaging parameter dict\n"
-            param_str += "        DispersionVisitor* visitor = new DispersionVisitor();\n"
-            param_str += "        PyObject * disp_dict;\n"
-            for par in self.disp_params:
-                par = par.strip()
-                param_str += "        disp_dict = PyDict_New();\n"
-                param_str += "        self->model->%s.dispersion->accept_as_source(visitor, self->model->%s.dispersion, disp_dict);\n" % (par, par)
-                param_str += "        PyDict_SetItemString(self->dispersion, \"%s\", disp_dict);\n" % par
+            if len(self.disp_params)>0:
+                param_str += "        // Initialize dispersion / averaging parameter dict\n"
+                param_str += "        DispersionVisitor* visitor = new DispersionVisitor();\n"
+                param_str += "        PyObject * disp_dict;\n"
+                for par in self.disp_params:
+                    par = par.strip()
+                    param_str += "        disp_dict = PyDict_New();\n"
+                    param_str += "        self->model->%s.dispersion->accept_as_source(visitor, self->model->%s.dispersion, disp_dict);\n" % (par, par)
+                    param_str += "        PyDict_SetItemString(self->dispersion, \"%s\", disp_dict);\n" % par
                 
             # Initialize dispersion object dictionnary
@@ -345 +346 @@
                     (par, par)
                     
-            param_str += "    // Read in dispersion parameters\n"
-            param_str += "    PyObject* disp_dict;\n"
-            param_str += "    DispersionVisitor* visitor = new DispersionVisitor();\n"
-            for par in self.disp_params:
-                par = par.strip()
-                param_str += "    disp_dict = PyDict_GetItemString(self->dispersion, \"%s\");\n" % par
-                param_str += "    self->model->%s.dispersion->accept_as_destination(visitor, self->model->%s.dispersion, disp_dict);\n" % (par, par)
+            if len(self.disp_params)>0:
+                param_str += "    // Read in dispersion parameters\n"
+                param_str += "    PyObject* disp_dict;\n"
+                param_str += "    DispersionVisitor* visitor = new DispersionVisitor();\n"
+                for par in self.disp_params:
+                    par = par.strip()
+                    param_str += "    disp_dict = PyDict_GetItemString(self->dispersion, \"%s\");\n" % par
+                    param_str += "    self->model->%s.dispersion->accept_as_destination(visitor, self->model->%s.dispersion, disp_dict);\n" % (par, par)
                 
             newline = self.replaceToken(newline, "[READDICTIONARY]", param_str)