Changeset 8960479 in sasview

Timestamp:

May 20, 2011 11:02:30 AM (14 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:

0286321

Parents:

a436b2e

Message:

fixes multiplication model with multifunctional

Files:

• sansmodels/src/sans/models/MultiplicationModel.py (modified) (2 diffs)
• sansview/perspectives/fitting/basepage.py (modified) (3 diffs)
• sansview/perspectives/fitting/fitpage.py (modified) (2 diffs)

sansmodels/src/sans/models/MultiplicationModel.py

@@ -33 +33 @@
         self.details = {}
         
-        # non-fittable parameters
-        self.non_fittable = p_model.non_fittable   
-            
         ##models 
         self.p_model= p_model
-        self.s_model= s_model
-        
+        self.s_model= s_model        
        
         ## dispersion
@@ -67 +63 @@
             multiplicity = 1
         ## functional multiplicity of the model
-        self.multiplicity = multiplicity      
-        
+        self.multiplicity = multiplicity    
+          
+        # non-fittable parameters
+        self.non_fittable = p_model.non_fittable  
+        self.multiplicity_info = [] 
+        self.fun_list = {}
+        if self.non_fittable > 1:
+            try:
+                self.multiplicity_info = p_model.multiplicity_info 
+                self.fun_list = p_model.fun_list
+            except:
+                pass
+        else:
+            self.multiplicity_info = []
+            
     def _clone(self, obj):
         """

sansview/perspectives/fitting/basepage.py

@@ -124 +124 @@
         if self.model != None:
             self.disp_list = self.model.getDispParamList()
-        
+        self.temp_multi_functional = False
         ##enable model 2D draw
         self.enable2D = False
@@ -1833 +1833 @@
         self._disp_obj_dict = {}
         self.disp_cb_dict ={}
-        
+        self.temp_multi_functional = False
         f_id = self.formfactorbox.GetCurrentSelection()
         #For MAC
@@ -1902 +1902 @@
             from sans.models.MultiplicationModel import MultiplicationModel
             self.model= MultiplicationModel(form_factor,struct_factor())
-            
+            # multifunctional form factor
+            if len(form_factor.non_fittable) > 0:
+                self.temp_multi_functional = True
         else:
             if form_factor != None:

sansview/perspectives/fitting/fitpage.py

@@ -1467 +1467 @@
         """
         # Check if it is multi_functional model
-        if self.model.__class__ not in self.model_list_box["Multi-Functions"]:
+        if self.model.__class__ not in self.model_list_box["Multi-Functions"] \
+                and not self.temp_multi_functional:
             return None
         # Get the func name list
@@ -2569 +2570 @@
                 iy += 1
                 ix = 0
-                if self.model.__class__ in \
-                    self.model_list_box["Multi-Functions"] \
-                    and item in self.model.non_fittable:
+                if (self.model.__class__ in \
+                    self.model_list_box["Multi-Functions"] or \
+                    self.temp_multi_functional)\
+                    and (item in self.model.non_fittable):
                     non_fittable_name = wx.StaticText(self, -1, item )
                     sizer.Add(non_fittable_name,(iy, ix),(1,1),\