Changeset 339ce67 in sasview for sansmodels/src/sans/models/ReflectivityModel.py

Timestamp:

Oct 12, 2010 6:22:08 PM (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:

20f00bed

Parents:

aaad3098

Message:

added some models and tests

File:

• sansmodels/src/sans/models/ReflectivityModel.py (modified) (3 diffs)

sansmodels/src/sans/models/ReflectivityModel.py

@@ -49 +49 @@
         self.model.params['n_layers'] = self.n_layers
         
-        ## functional multiplicity of the model
-        self.multiplicity = max_nshells
+        ## functional multiplicity info of the model
+        # [int(maximum no. of functionality),"str(Titl),
+        # [str(name of function0),...], [str(x-asix name of sld),...]]
+        self.multiplicity_info = [max_nshells,"No. of Layers:",[],['Depth']]
+
     
     def _clone(self, obj):
@@ -84 +87 @@
             n = 0
             pos = len(name.split('_'))-1
-            if name.split('_')[0] == 'func':
+            if name.split('_')[0] == 'sldIM':
+                continue
+            elif name.split('_')[0] == 'func':
                 n= -1
                 while n<self.n_layers:
@@ -141 +146 @@
                     if key.split('_')[1] == 'flat%s' % str(nshell+1):
                         try:
-                            value = self.model.params['sld_medium']
+                            if key.split('_')[0] == 'sld':
+                                value = self.model.params['sld_medium']
+                            elif key.split('_')[0] == 'sldIM':
+                                value = self.model.params['sldIM_medium']
                             self.model.setParam(key, value)
                         except: pass