Changeset 5c8ffa5 in sasview for sansmodels/src/python_wrapper

Timestamp:

Feb 22, 2013 3:04:16 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

ee74edd

Parents:

9a3b713

Message:

minor fix for reading disper. param names

File:

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

sansmodels/src/python_wrapper/WrapperGenerator.py

@@ -379 +379 @@
                 for par in self.disp_params:
                     par = par.strip()
+                    if par == '':
+                        continue
                     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)
@@ -402 +404 @@
                 for par in self.disp_params:
                     par = par.strip()
+                    if par == '':
+                        continue
                     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)
@@ -454 +458 @@
             for par in self.disp_params:
                 par = par.strip()
+                if par == '':
+                        continue
                 set_weights += "    if (!strcmp(par_name, \"%s\")) {\n" % par
                 set_weights += "        self->model->%s.dispersion = dispersion;\n" % par