Changeset db46d13 in sasview for src/sas/perspectives/fitting

Timestamp:

Mar 1, 2016 7:31:49 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

4adf48e

Parents:

792e6be

Message:

fix 2D barbell model and add it to the fit page

File:

• src/sas/perspectives/fitting/models.py (modified) (2 diffs)

src/sas/perspectives/fitting/models.py

@@ -315 +315 @@
         # regular model names only
         base_message = "Unable to load model {0}"
-        try:
-            self.model_name_list = []
+        self.model_name_list = []
+        try:
             from sas.models.SphereModel import SphereModel
             self.model_dictionary[SphereModel.__name__] = SphereModel
@@ -529 +529 @@
         except:
             logging.error(base_message.format(EllipticalCylinderModel.__name__))
+
+        try:
+            from sas.models.BarBellModel import BarBellModel
+
+            self.model_dictionary[BarBellModel.__name__] = BarBellModel
+            #       self.shape_list.append(BarBellModel)
+            self.model_name_list.append(BarBellModel.__name__)
+        except:
+            logging.error(base_message.format(BarBellModel.__name__))
 
         try: