Changeset 1b758b3 in sasview for sansmodels/src/python_wrapper

Timestamp:

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

ee0f3fc

Parents:

886dde6b

Message:

clean up warnings

File:

• sansmodels/src/python_wrapper/WrapperGenerator.py (modified) (2 diffs)

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)