Changeset 72f719b in sasview for sansview/perspectives/fitting

Timestamp:

Sep 11, 2009 8:01:47 AM (15 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:

f9bf661

Parents:

b1f7ec6

Message:

updated corresponding to the changes in P*S model function

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (2 diffs)
• models.py (modified) (2 diffs)

sansview/perspectives/fitting/basepage.py

@@ -982 +982 @@
         if model ==None:
             return
-        if hasattr(model ,"model2"):
-            
-            class_name= model.model2.__class__
-            name= model.model2.name
+        if hasattr(model ,"s_model"):
+            
+            class_name= model.s_model.__class__
+            name= model.s_model.name
             flag= name != "NoStructure"
             if flag and (class_name in self.model_list_box["Structure Factors"]):
@@ -1000 +1000 @@
                         break
                     
-        if hasattr(model ,"model1"):
-            class_name = model.model1.__class__
-            name = model.model1.name
+        if hasattr(model ,"p_model"):
+            class_name = model.p_model.__class__
+            name = model.p_model.name
             self.formfactorbox.Clear()
             

sansview/perspectives/fitting/models.py

@@ -148 +148 @@
         from sans.models.FlexibleCylinderModel import FlexibleCylinderModel
         self.shape_list.append(FlexibleCylinderModel)
-        self.multiplication_factor.append(FlexibleCylinderModel)
+
         
         from sans.models.StackedDisksModel import StackedDisksModel
@@ -156 +156 @@
         from sans.models.ParallelepipedModel import ParallelepipedModel
         self.shape_list.append(ParallelepipedModel)
+        self.multiplication_factor.append(ParallelepipedModel)
         
         from sans.models.EllipticalCylinderModel import EllipticalCylinderModel
         self.shape_list.append(EllipticalCylinderModel)
-        
+        self.multiplication_factor.append(EllipticalCylinderModel)
+                
         from sans.models.EllipsoidModel import EllipsoidModel
         self.shape_list.append(EllipsoidModel)