Changeset 2b4c8ca in sasview for fittingview/src/sans

Timestamp:

Jan 19, 2012 11:48:43 AM (13 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:

4310dbb

Parents:

33477fd

Message:

a little correction for naming the sum model especially when one of the models has all lower case name

Location:

fittingview/src/sans/perspectives/fitting/plugin_models

Files:

• sum_Ap1_1_Ap2.py (modified) (1 diff)
• sum_p1_p2.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/plugin_models/sum_Ap1_1_Ap2.py

@@ -132 +132 @@
         """
         name = "A*"
-        name += self._get_upper_name(name1)
+        p1_name = self._get_upper_name(name1)
+        if not p1_name:
+            p1_name = name1
+        name += p1_name
         name += "+(1-A)*"
-        name += self._get_upper_name(name2)
+        p2_name = self._get_upper_name(name2)
+        if not p2_name:
+            p2_name = name2
+        name += p2_name
         return name
     

fittingview/src/sans/perspectives/fitting/plugin_models/sum_p1_p2.py

@@ -130 +130 @@
         Get combined name from two model names
         """
-        name = self._get_upper_name(name1)
+        p1_name = self._get_upper_name(name1)
+        if not p1_name:
+            p1_name = name1
+        name = p1_name
         name += "+"
-        name += self._get_upper_name(name2)
+        p2_name = self._get_upper_name(name2)
+        if not p2_name:
+            p2_name = name2
+        name += p2_name
         return name