Changeset 279e371 in sasview for sansmodels/src/sans/models/CoreMultiShellModel.py

Timestamp:

Apr 18, 2012 1:26:13 PM (12 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

499fe7a

Parents:

3ee4d96

Message:

Fixing code style problems

File:

• sansmodels/src/sans/models/CoreMultiShellModel.py (modified) (14 diffs)

sansmodels/src/sans/models/CoreMultiShellModel.py

@@ -1 @@
-   
+"""
+    Core-Multi-Shell model
+"""
 from sans.models.BaseComponent import BaseComponent
 from sans.models.CoreFourShellModel import CoreFourShellModel
@@ -11 +13 @@
     def __init__(self, multfactor=1):
         BaseComponent.__init__(self)
-        """
-        :param n_shells: number of shells in the model, assumes 1<= n_shells <=4.
-        """
 
         ## Setting  model name model description
-        self.description=""
         model = CoreFourShellModel()
         self.model = model
         self.name = "CoreMultiShellModel"
-        self.description=""
+        self.description = ""
         self.n_shells = multfactor
         ## Define parameters
@@ -45 +43 @@
         # [int(maximum no. of functionality),"str(Titl),
         # [str(name of function0),...], [str(x-asix name of sld),...]]
-        self.multiplicity_info = [max_nshells,"No. of Shells:",[],['Radius']]
-
-        ## parameters with orientation: can be removed since there is no orientational params
+        self.multiplicity_info = [max_nshells, "No. of Shells:", [], ['Radius']]
+
+        ## parameters with orientation:
         for item in self.model.orientation_params:
             self.orientation_params.append(item)
-                
         
     def _clone(self, obj):
@@ -57 +54 @@
         data members to a fresh copy.
         """
-        obj.params     = copy.deepcopy(self.params)
-        obj.description     = copy.deepcopy(self.description)
-        obj.details    = copy.deepcopy(self.details)
+        obj.params = copy.deepcopy(self.params)
+        obj.description = copy.deepcopy(self.description)
+        obj.details = copy.deepcopy(self.details)
         obj.dispersion = copy.deepcopy(self.dispersion)
-        obj.model  = self.model.clone()
+        obj.model = self.model.clone()
 
         return obj
-    
     
     def _set_dispersion(self):
@@ -75 +71 @@
             nshell = 0
             if name.split('_')[0] == 'thick':
-                while nshell<self.n_shells:
+                while nshell < self.n_shells:
                     nshell += 1
                     if name.split('_')[1] == 'shell%s' % str(nshell):
-                        self.dispersion[name]= value
+                        self.dispersion[name] = value
                     else: 
                         continue
             else:
-                self.dispersion[name]= value
+                self.dispersion[name] = value
                               
 
@@ -94 +90 @@
             nshell = 0
             if name.split('_')[0] == 'thick' or name.split('_')[0] == 'sld':
-                if name.split('_')[1] == 'solv' or name.split('_')[1] == 'core0':
-                    self.params[name]= value
+                if name.split('_')[1] == 'solv' \
+                    or name.split('_')[1] == 'core0':
+                    self.params[name] = value
                     continue
-                while nshell<self.n_shells:
+                while nshell < self.n_shells:
                     nshell += 1
                     if name.split('_')[1] == 'shell%s' % str(nshell):
-                        self.params[name]= value
+                        self.params[name] = value
                         continue
             else:
-                self.params[name]= value
+                self.params[name] = value
             
             
@@ -116 +113 @@
         for name ,detail in self.model.details.iteritems():
             if name in self.params.iterkeys():
-                self.details[name]= detail
+                self.details[name] = detail
             
     
@@ -131 +128 @@
 
                 for nshell in range(self.n_shells,max_nshells):
-                    if key.split('_')[0] == 'sld' and key.split('_')[1] == 'shell%s' % str(nshell+1):
+                    if key.split('_')[0] == 'sld' and \
+                        key.split('_')[1] == 'shell%s' % str(nshell+1):
                         try:
                             value = self.model.params['sld_solv']
                             self.model.setParam(key, value)
-                        except: pass
+                        except:
+                            message = "CoreMultiShellModel evaluation problem"
+                            raise RuntimeError, message
 
     def getProfile(self):
@@ -155 +155 @@
         
         # for shells
-        for n in range(1,self.n_shells+1):
+        for n in range(1, self.n_shells+1):
             # Left side of each shells
             r0 = r[len(r)-1]            
@@ -186 +186 @@
         self._setParamHelper( name, value)
         ## setParam to model 
-        if name=='sld_solv':
-            # the sld_*** model.params not in params must set to value of sld_solv
+        if name == 'sld_solv':
+            # the sld_*** model.params not in params 
+            # must set to value of sld_solv
             for key in self.model.params.iterkeys():
                 if key not in self.params.keys()and key.split('_')[0] == 'sld':
-                        self.model.setParam(key, value)
+                    self.model.setParam(key, value)
         self.model.setParam( name, value)
 
@@ -199 +200 @@
         #look for dispersion parameters
         toks = name.split('.')
-        if len(toks)==2:
+        if len(toks) == 2:
             for item in self.dispersion.keys():
                 if item.lower()==toks[0].lower():
@@ -224 +225 @@
 
         self.fixed.sort()
-        pass         
                 
     def run(self, x = 0.0):
@@ -250 +250 @@
     ## Now (May27,10) directly uses the model eval function 
     ## instead of the for-loop in Base Component.
-    def evalDistribution(self, x = []):
+    def evalDistribution(self, x):
         """ 
         Evaluate the model in cartesian coordinates
@@ -267 +267 @@
         :dispersion: dispersion object of type DispersionModel
         """
-        value= None
+        value = None
         try:
             if parameter in self.model.dispersion.keys():
-                value= self.model.set_dispersion(parameter, dispersion)
+                value = self.model.set_dispersion(parameter, dispersion)
             self._set_dispersion()
             return value