Changeset 8960479 in sasview for sansmodels/src/sans

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

File:

• sansmodels/src/sans/models/MultiplicationModel.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):
         """