Changeset e758662 in sasmodels

Timestamp:

Jun 27, 2016 11:27:00 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

fa800e72

Parents:

117090a

Message:

preserve case in model parameter names for sasview

File:

• sasmodels/sasview_model.py (modified) (6 diffs)

sasmodels/sasview_model.py

@@ -261 +261 @@
         :param par_name: the parameter name to check
         """
-        return par_name.lower() in self.fixed
+        return par_name in self.fixed
         #For the future
         #return self.params[str(par_name)].is_fittable()
@@ -288 +288 @@
         if len(toks) == 2:
             for item in self.dispersion.keys():
-                if item.lower() == toks[0].lower():
+                if item == toks[0]:
                     for par in self.dispersion[item]:
-                        if par.lower() == toks[1].lower():
+                        if par == toks[1]:
                             self.dispersion[item][par] = value
                             return
@@ -296 +296 @@
             # Look for standard parameter
             for item in self.params.keys():
-                if item.lower() == name.lower():
+                if item == name:
                     self.params[item] = value
                     return
@@ -313 +313 @@
         if len(toks) == 2:
             for item in self.dispersion.keys():
-                if item.lower() == toks[0].lower():
+                if item == toks[0]:
                     for par in self.dispersion[item]:
-                        if par.lower() == toks[1].lower():
+                        if par == toks[1]:
                             return self.dispersion[item][par]
         else:
             # Look for standard parameter
             for item in self.params.keys():
-                if item.lower() == name.lower():
+                if item == name:
                     return self.params[item]
 
@@ -339 +339 @@
         """
         # TODO: fix test so that parameter order doesn't matter
-        ret = ['%s.%s' % (d.lower(), p)
+        ret = ['%s.%s' % (d, p)
                for d in self._model_info['partype']['pd-2d']
                for p in ('npts', 'nsigmas', 'width')]
@@ -484 +484 @@
         :param dispersion: dispersion object of type Dispersion
         """
-        if parameter.lower() in (s.lower() for s in self.params.keys()):
+        if parameter in (s for s in self.params.keys()):
             # TODO: Store the disperser object directly in the model.
             # The current method of creating one on the fly whenever it is