Changeset fb59ed9 in sasview

Timestamp:

Oct 20, 2010 6:08:34 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:

d2539aa

Parents:

f118fe2f

Message:

added new models

Files:

• sansview/perspectives/fitting/basepage.py (modified) (11 diffs)
• sansview/perspectives/fitting/fitpage.py (modified) (6 diffs)
• sansview/perspectives/fitting/fitting.py (modified) (1 diff)
• sansview/perspectives/fitting/models.py (modified) (10 diffs)
• sansview/perspectives/fitting/pagestate.py (modified) (4 diffs)
• sansview/perspectives/fitting/simfitpage.py (modified) (1 diff)
• theoryview/perspectives/theory/basepage.py (modified) (11 diffs)
• theoryview/perspectives/theory/model_panel.py (modified) (5 diffs)
• theoryview/perspectives/theory/models.py (modified) (6 diffs)
• theoryview/perspectives/theory/pagestate.py (modified) (3 diffs)
• theoryview/perspectives/theory/profile_dialog.py (modified) (9 diffs)

sansview/perspectives/fitting/basepage.py

@@ -94 +94 @@
         ##[cb state, name, value, "+/-", error of fit, min, max , units]
         self.parameters=[]
+        # non-fittable parameter whose value is astring
+        self.str_parameters = []
         ## list of parameters to fit , must be like self.parameters
         self.param_toFit=[]
@@ -947 +949 @@
         self._reset_parameters_state(self.orientation_params,
                                      state.orientation_params)
+        self._reset_parameters_state(self.str_parameters,
+                                     state.str_parameters)
         self._reset_parameters_state(self.parameters,state.parameters)    
          ## display dispersion info layer        
@@ -1486 +1490 @@
                 elif k == "Structure Factors":
                      self.struct_rbutton.SetValue(True)
+                elif  k == "Multi-Functions":
+                    continue
                 else:
                     self.plugin_rbutton.SetValue(True)
@@ -1536 +1542 @@
                 elif k == "Structure Factors":
                     self.struct_rbutton.SetValue(True)
+                elif  k == "Multi-Functions":
+                    continue
                 else:
                     self.plugin_rbutton.SetValue(True)
@@ -1622 +1630 @@
         self.text2 = wx.StaticText( self,-1,"P(Q)*S(Q)" )
         self.mutifactor_text = wx.StaticText( self,-1,"No. of Shells: " )
+        self.mutifactor_text1 = wx.StaticText( self,-1,"" )
         self.show_sld_button = wx.Button( self,-1,"Show SLD Profile" )
         self.show_sld_button.Bind(wx.EVT_BUTTON,self._on_show_sld)
@@ -1652 +1661 @@
         mutifactor_selection.Add(self.mutifactor_text)
         mutifactor_selection.Add(self.multifactorbox)
+        mutifactor_selection.Add((5,5))
+        mutifactor_selection.Add(self.mutifactor_text1)
         mutifactor_selection.Add((10,5))
         mutifactor_selection.Add(self.show_sld_button)
@@ -1662 +1673 @@
         
         self._set_multfactor_combobox()
+        self.multifactorbox.SetSelection(1)
         self.show_sld_button.Hide()
         #--------------------------------------------------------
@@ -1680 +1692 @@
         sld_data = Data1D(x,y)
         sld_data.name = 'SLD'
-   
-        self.panel = SLDPanel(self, data=sld_data,id =-1 )
+        sld_data.axes = self.sld_axes
+        self.panel = SLDPanel(self, data=sld_data,axes =self.sld_axes,id =-1 )
         self.panel.ShowModal()    
         
-    def _set_multfactor_combobox(self):   
+    def _set_multfactor_combobox(self, multiplicity=10):   
         """
         Set comboBox for muitfactor of CoreMultiShellModel
-        """
-        for idx in range(0,5):
+        :param multiplicit: no. of multi-functionality
+        """
+        # build content of the combobox
+        for idx in range(0,multiplicity):
             self.multifactorbox.Append(str(idx),int(idx))
-            self.multifactorbox.SetSelection(1) 
+            #self.multifactorbox.SetSelection(1) 
         self._hide_multfactor_combobox()
         
@@ -1699 +1713 @@
         if not self.mutifactor_text.IsShown():
             self.mutifactor_text.Show(True)
+            self.mutifactor_text1.Show(True)
         if not self.multifactorbox.IsShown():
             self.multifactorbox.Show(True)  
@@ -1708 +1723 @@
         if self.mutifactor_text.IsShown():
             self.mutifactor_text.Hide()
+            self.mutifactor_text1.Hide()
         if self.multifactorbox.IsShown():
             self.multifactorbox.Hide()   
@@ -1862 +1878 @@
             # set multifactor for Mutifunctional models    
             if form_factor().__class__ in self.model_list_box["Multi-Functions"]:
+                m_id = self.multifactorbox.GetCurrentSelection()
+                multiplicity = form_factor().multiplicity_info[0]
+                self.multifactorbox.Clear()
+                #self.mutifactor_text.SetLabel(form_factor().details[])
+                self._set_multfactor_combobox(multiplicity)
                 self._show_multfactor_combobox()
-                self.show_sld_button.Show(True)
-                m_id = self.multifactorbox.GetCurrentSelection()
+                #ToDo:  this info should be called directly from the model 
+                text = form_factor().multiplicity_info[1]#'No. of Shells: '
+
+                #self.mutifactor_text.Clear()
+                self.mutifactor_text.SetLabel(text)
+                if m_id > multiplicity -1:
+                    # default value
+                    m_id = 1
+                    
                 self.multi_factor = self.multifactorbox.GetClientData(m_id)
                 if self.multi_factor == None: self.multi_factor =0
                 form_factor = form_factor(int(self.multi_factor))
+                self.multifactorbox.SetSelection(m_id)
+                # Check len of the text1 and max_multiplicity
+                text = ''
+                if form_factor.multiplicity_info[0] == len(form_factor.multiplicity_info[2]):
+                    text = form_factor.multiplicity_info[2][self.multi_factor]
+                self.mutifactor_text1.SetLabel(text)
+                # Check if model has  get sld profile.
+                if len(form_factor.multiplicity_info[3]) > 0:
+                    self.sld_axes = form_factor.multiplicity_info[3]
+                    self.show_sld_button.Show(True)
+                else:
+                    self.sld_axes = ""
+
             else:
                 self._hide_multfactor_combobox()

sansview/perspectives/fitting/fitpage.py

@@ -1192 +1192 @@
             self.smear_accuracy.Append(list[idx],idx)
             
+    def _set_fun_box_list(self,fun_box):
+        """
+        Set the list of func for multifunctional models
+        """
+        # Check if it is multi_functional model
+        if self.model.__class__ not in self.model_list_box["Multi-Functions"]:
+            return None
+        # Get the func name list
+        list = self.model.fun_list
+        if len(list) == 0:
+            return None
+        # build function (combo)box
+        ind = 0
+        while(ind < len(list)):
+            for key, val in list.iteritems():
+                if (val == ind):
+                    fun_box.Append(key,val)
+                    break
+            ind += 1
+        
     def _on_select_accuracy(self,event):
         """
@@ -1206 +1226 @@
             if self.current_smearer != None:
                 self.current_smearer.set_accuracy(accuracy = self.smear2d_accuracy) 
+        event.Skip()
+
+    def _on_fun_box(self,event):
+        """
+        Select an func: Erf,Rparabola,LParabola
+        """
+        fun_val = None
+        fun_box = event.GetEventObject()
+        name = fun_box.Name
+        value = fun_box.GetValue()
+        if self.model.fun_list.has_key(value):
+            fun_val = self.model.fun_list[value]
+
+        self.model.setParam(name,fun_val)
+        # save state
+        self._copy_parameters_state(self.str_parameters, self.state.str_parameters)
+        # update params
+        self._update_paramv_on_fit() 
+        # draw
+        self._draw_model()
+        self.Refresh()
+        # get ready for new event
         event.Skip()
         
@@ -2046 +2088 @@
         self.sizer3.Clear(True)
         self.parameters = []
+        self.str_parameters = []
         self.param_toFit=[]
         self.fittable_param=[]
@@ -2074 +2117 @@
             Custom compare to order, first by alphabets then second by number.
             """ 
+            # number at the last digit
             a_last = a[len(a)-1]
             b_last = b[len(b)-1]
-            
+            # default
             num_a = None
             num_b = None
+            # split the names
+            a2 = a.lower().split('_')
+            b2 = b.lower().split('_')
+            # check length of a2, b2
+            len_a2 = len(a2)
+            len_b2 = len(b2)
             # check if it contains a int number(<10)
             try: 
@@ -2086 +2136 @@
                 num_b = int(b_last)
             except: pass
+            # Put 'scale' near the top; happens 
+            # when numbered param name exists
+            if a == 'scale':
+                return -1
             # both have a number    
             if num_a != None and num_b != None:
-                if num_a > num_b: return 1
+                if num_a > num_b: return -1
+                # same number
                 elif num_a == num_b: 
-                    return cmp(a.lower(), b.lower())
-                else: return -1
+                    # different last names
+                    if a2[len_a2-1] != b2[len_b2-1] and num_a != 0:
+                        return -cmp(a2[len_a2-1], b2[len_b2-1])
+                    else: 
+                        return cmp(a, b) 
+                else: return 1
             # one of them has a number
             elif num_a != None: return 1
             elif num_b != None: return -1
-            # no nuumbers
+            # no numbers
             else: return cmp(a.lower(), b.lower())
+
                         
         keys.sort(custom_compare)
@@ -2147 +2207 @@
                 iy += 1
                 ix = 0
-                ## add parameters name with checkbox for selecting to fit
-                cb = wx.CheckBox(self, -1, item )              
-                cb.SetToolTipString(" Check for fitting.")
-                #cb.SetValue(True)
-                wx.EVT_CHECKBOX(self, cb.GetId(), self.select_param)
-                
-                sizer.Add( cb,( iy, ix),(1,1),
-                             wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5)
-                
-                ## add parameter value
-                ix += 1
-                value= self.model.getParam(item)
-                ctl1 = self.ModelTextCtrl(self, -1, size=(_BOX_WIDTH,20),
-                                    style=wx.TE_PROCESS_ENTER)
-                ctl1.SetToolTipString("Hit 'Enter' after typing.")
-                ctl1.SetValue(format_number(value))
-                sizer.Add(ctl1, (iy,ix),(1,1), wx.EXPAND)
-                ## text to show error sign
-                ix += 1
-                text2=wx.StaticText(self, -1, '+/-')
-                sizer.Add(text2,(iy, ix),(1,1),\
-                                wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
-                text2.Hide() 
-                ix += 1
-                ctl2 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20), style=0)
-                sizer.Add(ctl2, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                ctl2.Hide()
-                
-                ix += 1
-                ctl3 = self.ModelTextCtrl(self, -1, size=(_BOX_WIDTH/2,20), style=wx.TE_PROCESS_ENTER,
-                                               text_enter_callback = self._onparamRangeEnter)
-     
-                sizer.Add(ctl3, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                ctl3.Hide()
-        
-                ix += 1
-                ctl4 = self.ModelTextCtrl(self, -1, size=(_BOX_WIDTH/2,20), style=wx.TE_PROCESS_ENTER,
-                                               text_enter_callback = self._onparamRangeEnter)
-                sizer.Add(ctl4, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-      
-                ctl4.Hide()
-
-                if self.engine_type=="park":
-                    ctl3.Show(True)
-                    ctl4.Show(True)
-                ix +=1
-                # Units
-                if self.model.details.has_key(item):
-                    units = wx.StaticText(self, -1, self.model.details[item][0], style=wx.ALIGN_LEFT)
+                if self.model.__class__ in self.model_list_box["Multi-Functions"] \
+                    and item in self.model.non_fittable:
+                    non_fittable_name = wx.StaticText(self, -1, item )
+                    sizer.Add(non_fittable_name,(iy, ix),(1,1),\
+                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 21)
+                    ## add parameter value
+                    ix += 1
+                    value= self.model.getParam(item)
+                    if len(self.model.fun_list) > 0:
+                        num = item.split('_')[1][5:7]
+                        fun_box = wx.ComboBox(self, -1,size=(100,-1),style=wx.CB_READONLY, name = '%s'% item)
+                        self._set_fun_box_list(fun_box)
+                        fun_box.SetSelection(0)
+                        #self.fun_box.SetToolTipString("A function describing the interface")
+                        wx.EVT_COMBOBOX(fun_box,-1, self._on_fun_box)
+                    else:
+                        fun_box = self.ModelTextCtrl(self, -1, size=(_BOX_WIDTH,20),
+                                        style=wx.TE_PROCESS_ENTER, name ='%s'% item)
+                        fun_box.SetToolTipString("Hit 'Enter' after typing.")
+                        fun_box.SetValue(format_number(value))
+                    sizer.Add(fun_box, (iy,ix),(1,1), wx.EXPAND)
+                    self.str_parameters.append([None,item, fun_box,None,None,None,None,None])
+
+                    
                 else:
-                    units = wx.StaticText(self, -1, "", style=wx.ALIGN_LEFT)
-                sizer.Add(units, (iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                    ## add parameters name with checkbox for selecting to fit
+                    cb = wx.CheckBox(self, -1, item )              
+                    cb.SetToolTipString(" Check for fitting.")
+                    #cb.SetValue(True)
+                    wx.EVT_CHECKBOX(self, cb.GetId(), self.select_param)
                     
-                ##[cb state, name, value, "+/-", error of fit, min, max , units]
-                self.parameters.append([cb,item, ctl1,
-                                        text2,ctl2, ctl3, ctl4,units])
-              
+                    sizer.Add( cb,( iy, ix),(1,1),
+                                 wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5)
+
+                    ## add parameter value
+                    ix += 1
+                    value= self.model.getParam(item)
+                    ctl1 = self.ModelTextCtrl(self, -1, size=(_BOX_WIDTH,20),
+                                        style=wx.TE_PROCESS_ENTER)
+                    ctl1.SetToolTipString("Hit 'Enter' after typing.")
+                    ctl1.SetValue(format_number(value))
+                    sizer.Add(ctl1, (iy,ix),(1,1), wx.EXPAND)
+                    ## text to show error sign
+                    ix += 1
+                    text2=wx.StaticText(self, -1, '+/-')
+                    sizer.Add(text2,(iy, ix),(1,1),\
+                                    wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
+                    text2.Hide() 
+                    ix += 1
+                    ctl2 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20), style=0)
+                    sizer.Add(ctl2, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                    ctl2.Hide()
+                    
+                    ix += 1
+                    ctl3 = self.ModelTextCtrl(self, -1, size=(_BOX_WIDTH/2,20), style=wx.TE_PROCESS_ENTER,
+                                                   text_enter_callback = self._onparamRangeEnter)
+         
+                    sizer.Add(ctl3, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                    ctl3.Hide()
+            
+                    ix += 1
+                    ctl4 = self.ModelTextCtrl(self, -1, size=(_BOX_WIDTH/2,20), style=wx.TE_PROCESS_ENTER,
+                                                   text_enter_callback = self._onparamRangeEnter)
+                    sizer.Add(ctl4, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+          
+                    ctl4.Hide()
+    
+                    if self.engine_type=="park":
+                        ctl3.Show(True)
+                        ctl4.Show(True)
+                    ix +=1
+                    # Units
+                    if self.model.details.has_key(item):
+                        units = wx.StaticText(self, -1, self.model.details[item][0], style=wx.ALIGN_LEFT)
+                    else:
+                        units = wx.StaticText(self, -1, "", style=wx.ALIGN_LEFT)
+                    sizer.Add(units, (iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                        
+                    ##[cb state, name, value, "+/-", error of fit, min, max , units]
+                    self.parameters.append([cb,item, ctl1,
+                                            text2,ctl2, ctl3, ctl4,units])
+                                  
         iy+=1
         sizer.Add((10,10),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)

sansview/perspectives/fitting/fitting.py

@@ -823 +823 @@
             self.fitter.set_model(model, self.fit_id,
                                    pars,constraints = listOfConstraint)
-            
+            print "listOfConstraint",listOfConstraint
             self.fitter.set_data(data=metadata,Uid=self.fit_id,
                                  smearer=smearer,qmin= qmin,qmax=qmax )

sansview/perspectives/fitting/models.py

@@ -172 +172 @@
         
         """
-        ## form factor
         from sans.models.SphereModel import SphereModel
         self.shape_list.append(SphereModel)
@@ -185 +184 @@
         self.shape_list.append(FuzzySphereModel)
         self.multiplication_factor.append(FuzzySphereModel)
-        
+           
         from sans.models.CoreShellModel import CoreShellModel
         self.shape_list.append(CoreShellModel)
@@ -194 +193 @@
         self.multiplication_factor.append(CoreMultiShellModel)
         self.multi_func_list.append(CoreMultiShellModel)
-        
+
         from sans.models.VesicleModel import VesicleModel
         self.shape_list.append(VesicleModel)
@@ -232 +231 @@
         self.multiplication_factor.append(ParallelepipedModel)
         
+        from sans.models.CSParallelepipedModel import CSParallelepipedModel
+        self.shape_list.append(CSParallelepipedModel)
+        self.multiplication_factor.append(CSParallelepipedModel)
+        
         from sans.models.EllipticalCylinderModel import EllipticalCylinderModel
         self.shape_list.append(EllipticalCylinderModel)
         self.multiplication_factor.append(EllipticalCylinderModel)
-                
+        
+        from sans.models.BarBellModel import BarBellModel
+        self.shape_list.append(BarBellModel)
+        # not implemeted yet!
+        #self.multiplication_factor.append(BarBellModel)
+        
+        from sans.models.CappedCylinderModel import CappedCylinderModel
+        self.shape_list.append(CappedCylinderModel)
+        # not implemeted yet!
+        #self.multiplication_factor.append(CappedCylinderModel)
+        
         from sans.models.EllipsoidModel import EllipsoidModel
         self.shape_list.append(EllipsoidModel)
@@ -259 +272 @@
         from sans.models.LamellarPSHGModel import LamellarPSHGModel
         self.shape_list.append(LamellarPSHGModel)
+        
+        from sans.models.LamellarPCrystalModel import LamellarPCrystalModel
+        self.shape_list.append(LamellarPCrystalModel)
+        
+        from sans.models.SCCrystalModel import SCCrystalModel
+        self.shape_list.append(SCCrystalModel)
+        
+        from sans.models.FCCrystalModel import FCCrystalModel
+        self.shape_list.append(FCCrystalModel)
+        
+        from sans.models.BCCrystalModel import BCCrystalModel
+        self.shape_list.append(BCCrystalModel)
       
         ## Structure factor 
@@ -272 +297 @@
         from sans.models.HayterMSAStructure import HayterMSAStructure
         self.struct_list.append(HayterMSAStructure)
-    
-        ##shape-independent models  
+        
+        ##shape-independent models
         from sans.models.PowerLawAbsModel import PowerLawAbsModel
         self.shape_indep_list.append( PowerLawAbsModel )
@@ -280 +305 @@
         self.shape_indep_list.append(BEPolyelectrolyte )
         self.form_factor_dict[str(wx.NewId())] =  [SphereModel]
-
+        
+        from sans.models.BroadPeakModel import BroadPeakModel
+        self.shape_indep_list.append(BroadPeakModel)
+        
+        from sans.models.CorrLengthModel import CorrLengthModel
+        self.shape_indep_list.append(CorrLengthModel)
+        
         from sans.models.DABModel import DABModel
         self.shape_indep_list.append(DABModel )
@@ -287 +318 @@
         self.shape_indep_list.append(DebyeModel )
         
+        #FractalModel (a c-model)is now being used instead of FractalAbsModel.
+        from sans.models.FractalModel import FractalModel
+        self.shape_indep_list.append(FractalModel )
+        
+        from sans.models.FractalCoreShellModel import FractalCoreShellModel
+        self.shape_indep_list.append(FractalCoreShellModel )
+        
+        from sans.models.GaussLorentzGelModel import GaussLorentzGelModel
+        self.shape_indep_list.append(GaussLorentzGelModel) 
+                
         from sans.models.GuinierModel import GuinierModel
         self.shape_indep_list.append(GuinierModel )
         
-        from sans.models.FractalModel import FractalModel
-        self.shape_indep_list.append(FractalModel )
-        
+        from sans.models.GuinierPorodModel import GuinierPorodModel
+        self.shape_indep_list.append(GuinierPorodModel )
+
         from sans.models.LorentzModel import LorentzModel
         self.shape_indep_list.append( LorentzModel) 
@@ -304 +345 @@
         from sans.models.Poly_GaussCoil import Poly_GaussCoil
         self.shape_indep_list.append(Poly_GaussCoil)
-                 
+        
+        from sans.models.PolymerExclVolume import PolymerExclVolume
+        self.shape_indep_list.append(PolymerExclVolume)
+        
         from sans.models.PorodModel import PorodModel
-        self.shape_indep_list.append(PorodModel )
-        
-        #FractalModel (a c-model)will be used.
-        #from sans.models.FractalAbsModel import FractalAbsModel
-        #self.shape_indep_list.append(FractalAbsModel)
+        self.shape_indep_list.append(PorodModel )      
+        
+        from sans.models.RPA10Model import RPA10Model
+        self.shape_indep_list.append(RPA10Model)
+        self.multi_func_list.append(RPA10Model)
         
         from sans.models.TeubnerStreyModel import TeubnerStreyModel
         self.shape_indep_list.append(TeubnerStreyModel )
         
+        from sans.models.TwoLorentzianModel import TwoLorentzianModel
+        self.shape_indep_list.append(TwoLorentzianModel )
+        
+        from sans.models.TwoPowerLawModel import TwoPowerLawModel
+        self.shape_indep_list.append(TwoPowerLawModel )
+        
+        from sans.models.UnifiedPowerRgModel import UnifiedPowerRgModel
+        self.shape_indep_list.append(UnifiedPowerRgModel )
+        self.multi_func_list.append(UnifiedPowerRgModel)
+        
         from sans.models.LineModel import LineModel
         self.shape_indep_list.append(LineModel)
         
+        from sans.models.ReflectivityModel import ReflectivityModel
+        self.multi_func_list.append(ReflectivityModel)
+    
         #Looking for plugins
         self.plugins = findModels()
+        self._get_multifunc_models()
+        self.plugins.append(ReflectivityModel)
         return 0
 
@@ -466 +525 @@
         wx.PostEvent(self.event_owner, evt)
         
+    def _get_multifunc_models(self):
+        """
+        Get the multifunctional models
+        """
+        for item in self.plugins:
+            try:
+                # check the multiplicity if any
+                if item.multiplicity_info[0] > 1:
+                    self.multi_func_list.append(item)
+            except:
+                # pass to other items
+                pass
+                    
     def get_model_list(self):    
         """

sansview/perspectives/fitting/pagestate.py

@@ -66 +66 @@
                             ["weights", "weights"]]
 
-list_of_state_parameters = [["parameters", "parameters"] ,                     
+list_of_state_parameters = [["parameters", "parameters"] , 
+                            ["str_parameters", "str_parameters"] ,                     
                             ["orientation_parameters", "orientation_params"],
                             ["dispersity_parameters", "orientation_params_disp"],
@@ -172 +173 @@
         # Contains link between  model ,all its parameters, and panel organization
         self.parameters = []
+        # String parameter list that can not be fitted
+        self.str_parameters = []
         # Contains list of parameters that cannot be fitted and reference to 
         #panel objects 
@@ -270 +273 @@
         obj.enable2D = copy.deepcopy(self.enable2D)
         obj.parameters = copy.deepcopy(self.parameters)
+        obj.str_parameters = copy.deepcopy(self.str_parameters)
         obj.fixed_param = copy.deepcopy(self.fixed_param)
         obj.fittable_param = copy.deepcopy(self.fittable_param)
@@ -365 +369 @@
         rep += "number parameters(self.parameters): %s\n"%len(self.parameters)
         rep = self._repr_helper( list=self.parameters, rep=rep)
+        rep += "number str_parameters(self.str_parameters): %s\n"%len(self.str_parameters)
+        rep = self._repr_helper( list=self.str_parameters, rep=rep)
         rep += "number orientation parameters"
         rep += "(self.orientation_params): %s\n"%len(self.orientation_params)

sansview/perspectives/fitting/simfitpage.py

@@ -23 +23 @@
     for item in model.getParamList():
         if not item  in model.getDispParamList():
-            fittable_param.append(item)
+            if not item in model.non_fittable:
+                fittable_param.append(item)
             
     for item in model.fixed:

theoryview/perspectives/theory/basepage.py

@@ -80 +80 @@
         ##[cb state, name, value, "+/-", error of fit, min, max , units]
         self.parameters=[]
+        # non-fittable parameter whose value is astring
+        self.str_parameters = []
         ## list of parameters to fit , must be like self.parameters
         self.param_toFit=[]
@@ -721 +723 @@
         self._reset_parameters_state(self.orientation_params,
                                      state.orientation_params)
+        self._reset_parameters_state(self.str_parameters,
+                                     state.str_parameters)
         self._reset_parameters_state(self.parameters,state.parameters)    
          ## display dispersion info layer        
@@ -1059 +1063 @@
                 elif k == "Structure Factors":
                      self.struct_rbutton.SetValue(True)
+                elif  k == "Multi-Functions":
+                    continue
                 else:
                     self.plugin_rbutton.SetValue(True)
@@ -1109 +1115 @@
                 elif k == "Structure Factors":
                     self.struct_rbutton.SetValue(True)
+                elif  k == "Multi-Functions":
+                    continue
                 else:
                     self.plugin_rbutton.SetValue(True)
@@ -1195 +1203 @@
         self.text2 = wx.StaticText( self,-1,"P(Q)*S(Q)" )
         self.mutifactor_text = wx.StaticText( self,-1,"No. of Shells: " )
+        self.mutifactor_text1 = wx.StaticText( self,-1,"" )
         self.show_sld_button = wx.Button( self,-1,"Show SLD Profile" )
         self.show_sld_button.Bind(wx.EVT_BUTTON,self._on_show_sld)
@@ -1244 +1253 @@
         mutifactor_selection.Add(self.multifactorbox)
         mutifactor_selection.Add((5,5))
+        mutifactor_selection.Add(self.mutifactor_text1)
+        mutifactor_selection.Add((10,5))
         mutifactor_selection.Add(self.show_sld_button)
         
@@ -1253 +1264 @@
         
         self._set_multfactor_combobox()
+        self.multifactorbox.SetSelection(1)
         self.show_sld_button.Hide()
         
@@ -1271 +1283 @@
         sld_data = Data1D(x,y)
         sld_data.name = 'SLD'
-   
-        self.panel = SLDPanel(self, data=sld_data,id =-1 )
+        sld_data.axes = self.sld_axes
+        self.panel = SLDPanel(self, data=sld_data,axes =self.sld_axes,id =-1 )
         self.panel.ShowModal()
 
-    def _set_multfactor_combobox(self):   
+    def _set_multfactor_combobox(self, multiplicity=10):   
         """
         Set comboBox for muitfactor of CoreMultiShellModel
-        """
-        for idx in range(0,5):
+        :param multiplicit: no. of multi-functionality
+        """
+        # build content of the combobox
+        for idx in range(0,multiplicity):
             self.multifactorbox.Append(str(idx),int(idx))
-            self.multifactorbox.SetSelection(1) 
+            #self.multifactorbox.SetSelection(1) 
         self._hide_multfactor_combobox()
         
@@ -1290 +1304 @@
         if not self.mutifactor_text.IsShown():
             self.mutifactor_text.Show(True)
+            self.mutifactor_text1.Show(True)
         if not self.multifactorbox.IsShown():
             self.multifactorbox.Show(True)  
@@ -1299 +1314 @@
         if self.mutifactor_text.IsShown():
             self.mutifactor_text.Hide()
+            self.mutifactor_text1.Hide()
         if self.multifactorbox.IsShown():
             self.multifactorbox.Hide()   
@@ -1487 +1503 @@
             # set multifactor for Mutifunctional models    
             if form_factor().__class__ in self.model_list_box["Multi-Functions"]:
+                m_id = self.multifactorbox.GetCurrentSelection()
+                multiplicity = form_factor().multiplicity_info[0]
+                self.multifactorbox.Clear()
+                #self.mutifactor_text.SetLabel(form_factor().details[])
+                self._set_multfactor_combobox(multiplicity)
                 self._show_multfactor_combobox()
-                self.show_sld_button.Show(True)
-                m_id = self.multifactorbox.GetCurrentSelection()
+                text = form_factor().multiplicity_info[1]#'No. of Shells: '
+
+                #self.mutifactor_text.Clear()
+                self.mutifactor_text.SetLabel(text)
+
+                # Check max value
+                if m_id > multiplicity -1:
+                    # default value
+                    m_id = 1
                 self.multi_factor = self.multifactorbox.GetClientData(m_id)
                 if self.multi_factor == None: self.multi_factor =1
                 form_factor = form_factor(int(self.multi_factor))
+                self.multifactorbox.SetSelection(m_id)
+                # Check len of the text1 and max_multiplicity
+                text = ''
+                if form_factor.multiplicity_info[0] == len(form_factor.multiplicity_info[2]):
+                    text = form_factor.multiplicity_info[2][self.multi_factor]
+                self.mutifactor_text1.SetLabel(text)
+                # Check if model has  get sld profile.
+                if len(form_factor.multiplicity_info[3]) > 0:
+                    self.sld_axes = form_factor.multiplicity_info[3]
+                    self.show_sld_button.Show(True)
+                else:
+                    self.sld_axes = ""
             else:
                 self._hide_multfactor_combobox()

theoryview/perspectives/theory/model_panel.py

@@ -362 +362 @@
         event = PageInfoEvent(page = self)
         wx.PostEvent(self.parent, event)
+        
+    def _set_fun_box_list(self,fun_box):
+        """
+        Set the list of func for multifunctional models
+        
+        :param fun_box: function combo box
+        """
+        # Check if it is multi_functional model
+        if self.model.__class__ not in self.model_list_box["Multi-Functions"]:
+            return None
+        # Get the func name list
+        list = self.model.fun_list
+       
+        if len(list) == 0:
+            return None
+
+        # build function (combo)box
+        ind = 0
+        while(ind < len(list)):
+            for key, val in list.iteritems():
+                if (val == ind):
+                    fun_box.Append(key,val)
+                    break
+            ind += 1
+            
+    def _on_fun_box(self,event):
+        """
+        Select an func: Erf,Rparabola,LParabola...
+        """
+        fun_val = None
+        fun_box = event.GetEventObject()
+        name = fun_box.Name
+        value = fun_box.GetValue()
+        if self.model.fun_list.has_key(value):
+            fun_val = self.model.fun_list[value]
+        
+        self.model.setParam(name,fun_val)
+        # save state
+        self._copy_parameters_state(self.str_parameters, self.state.str_parameters)
+        # update params
+        #self._update_paramv_on_fit() 
+
+        # draw
+        self._draw_model()
+        self.Refresh()
+        # get ready for new event
+        event.Skip()
               
     def set_data(self, list=[], state=None):
@@ -507 +554 @@
         self.sizer3.Clear(True)
         self.parameters = []
+        self.str_parameters = []
         self.param_toFit=[]
         self.fixed_param=[]
@@ -532 +580 @@
             Custom compare to order, first by alphabets then second by number.
             """ 
+            # number at the last digit
             a_last = a[len(a)-1]
             b_last = b[len(b)-1]
-            
+            # default
             num_a = None
             num_b = None
+            # split the names
+            a2 = a.lower().split('_')
+            b2 = b.lower().split('_')
+            # check length of a2, b2
+            len_a2 = len(a2)
+            len_b2 = len(b2)
             # check if it contains a int number(<10)
             try: 
@@ -544 +599 @@
                 num_b = int(b_last)
             except: pass
+            # Put 'scale' near the top; happens 
+            # when numbered param name exists
+            if a == 'scale':
+                return -1
             # both have a number    
             if num_a != None and num_b != None:
-                if num_a > num_b: return 1
+                if num_a > num_b: return -1
+                # same number
                 elif num_a == num_b: 
-                    return cmp(a.lower(), b.lower())
-                else: return -1
+                    # different last names
+                    if a2[len_a2-1] != b2[len_b2-1] and num_a != 0:
+                        return -cmp(a2[len_a2-1], b2[len_b2-1])
+                    else: 
+                        return cmp(a, b) 
+                else: return 1
             # one of them has a number
             elif num_a != None: return 1
             elif num_b != None: return -1
-            # no nuumbers
+            # no numbers
             else: return cmp(a.lower(), b.lower())
-            
+
         keys.sort(custom_compare)
 
@@ -578 +642 @@
                 iy += 1
                 ix = 0
-                name = wx.StaticText(self, -1,item)
-                sizer.Add( name,( iy, ix),(1,1),
-                             wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-
-                ix += 1
-                value= self.model.getParam(item)
-                ctl1 = self.ModelTextCtrl(self, -1, size=(_BOX_WIDTH,20),
-                    style=wx.TE_PROCESS_ENTER)
-                
-                ctl1.SetValue(str (format_number(value)))
-                
-                sizer.Add(ctl1, (iy,ix),(1,1), wx.EXPAND)
-                ix +=1
-                # Units
-                if self.model.details.has_key(item):
-                    units = wx.StaticText(self, -1, self.model.details[item][0], style=wx.ALIGN_LEFT)
+                if self.model.__class__ in self.model_list_box["Multi-Functions"]\
+                            and item in self.model.non_fittable:
+                    non_fittable_name = wx.StaticText(self, -1, item )
+                    sizer.Add(non_fittable_name,(iy, ix),(1,1),\
+                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+                    ## add parameter value
+                    ix += 1
+                    value= self.model.getParam(item)
+                    if len(self.model.fun_list) > 0:
+                        num = item.split('_')[1][5:7]
+                        fun_box = wx.ComboBox(self, -1,size=(100,-1),style=wx.CB_READONLY, name = '%s'% item)
+                        self._set_fun_box_list(fun_box)
+                        fun_box.SetSelection(0)
+                        #self.fun_box.SetToolTipString("A function describing the interface")
+                        wx.EVT_COMBOBOX(fun_box,-1, self._on_fun_box)
+                    else:
+                        fun_box = self.ModelTextCtrl(self, -1, size=(_BOX_WIDTH,20),
+                                        style=wx.TE_PROCESS_ENTER, name ='%s'% item)
+                        fun_box.SetToolTipString("Hit 'Enter' after typing.")
+                        fun_box.SetValue(format_number(value))
+                    sizer.Add(fun_box, (iy,ix),(1,1), wx.EXPAND)
+                    ##[cb state, name, value, "+/-", error of fit, min, max , units]
+                    self.str_parameters.append([None,item, fun_box, \
+                                                None,None,None,None,None])
                 else:
-                    units = wx.StaticText(self, -1, "", style=wx.ALIGN_LEFT)
-                sizer.Add(units, (iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                ##[cb state, name, value, "+/-", error of fit, min, max , units]
-                self.parameters.append([None,item, ctl1,
-                                        None,None, None, None,None])
+                    name = wx.StaticText(self, -1,item)
+                    sizer.Add( name,( iy, ix),(1,1),
+                                 wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+    
+                    ix += 1
+                    value= self.model.getParam(item)
+                    ctl1 = self.ModelTextCtrl(self, -1, size=(_BOX_WIDTH,20),
+                        style=wx.TE_PROCESS_ENTER)
+                    
+                    ctl1.SetValue(str (format_number(value)))
+                    
+                    sizer.Add(ctl1, (iy,ix),(1,1), wx.EXPAND)
+                    ix +=1
+                    # Units
+                    if self.model.details.has_key(item):
+                        units = wx.StaticText(self, -1, self.model.details[item][0], style=wx.ALIGN_LEFT)
+                    else:
+                        units = wx.StaticText(self, -1, "", style=wx.ALIGN_LEFT)
+                    sizer.Add(units, (iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                    ##[cb state, name, value, "+/-", error of fit, min, max , units]
+                    self.parameters.append([None,item, ctl1,
+                                            None,None, None, None,None])
         iy+=1
         sizer.Add((10,10),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)

theoryview/perspectives/theory/models.py

@@ -240 +240 @@
         self.multiplication_factor.append(ParallelepipedModel)
         
+        from sans.models.CSParallelepipedModel import CSParallelepipedModel
+        self.shape_list.append(CSParallelepipedModel)
+        self.multiplication_factor.append(CSParallelepipedModel)
+        
         from sans.models.EllipticalCylinderModel import EllipticalCylinderModel
         self.shape_list.append(EllipticalCylinderModel)
         self.multiplication_factor.append(EllipticalCylinderModel)
-                
+        
+        from sans.models.BarBellModel import BarBellModel
+        self.shape_list.append(BarBellModel)
+        # not implemeted yet!
+        #self.multiplication_factor.append(BarBellModel)
+        
+        from sans.models.CappedCylinderModel import CappedCylinderModel
+        self.shape_list.append(CappedCylinderModel)
+        # not implemeted yet!
+        #self.multiplication_factor.append(CappedCylinderModel)
+        
         from sans.models.EllipsoidModel import EllipsoidModel
         self.shape_list.append(EllipsoidModel)
@@ -267 +281 @@
         from sans.models.LamellarPSHGModel import LamellarPSHGModel
         self.shape_list.append(LamellarPSHGModel)
+        
+        from sans.models.LamellarPCrystalModel import LamellarPCrystalModel
+        self.shape_list.append(LamellarPCrystalModel)
+        
+        from sans.models.SCCrystalModel import SCCrystalModel
+        self.shape_list.append(SCCrystalModel)
+        
+        from sans.models.FCCrystalModel import FCCrystalModel
+        self.shape_list.append(FCCrystalModel)
+        
+        from sans.models.BCCrystalModel import BCCrystalModel
+        self.shape_list.append(BCCrystalModel)
       
         ## Structure factor 
@@ -290 +316 @@
         self.shape_indep_list.append(BEPolyelectrolyte )
         self.form_factor_dict[str(wx.NewId())] =  [SphereModel]
-
+        
+        from sans.models.BroadPeakModel import BroadPeakModel
+        self.shape_indep_list.append(BroadPeakModel)
+        
+        from sans.models.CorrLengthModel import CorrLengthModel
+        self.shape_indep_list.append(CorrLengthModel)
+        
         from sans.models.DABModel import DABModel
         self.shape_indep_list.append(DABModel )
@@ -297 +329 @@
         self.shape_indep_list.append(DebyeModel )
         
+        #FractalModel (a c-model)is now being used instead of FractalAbsModel.
+        from sans.models.FractalModel import FractalModel
+        self.shape_indep_list.append(FractalModel )
+        
+        from sans.models.FractalCoreShellModel import FractalCoreShellModel
+        self.shape_indep_list.append(FractalCoreShellModel )
+        
+        from sans.models.GaussLorentzGelModel import GaussLorentzGelModel
+        self.shape_indep_list.append(GaussLorentzGelModel) 
+                
         from sans.models.GuinierModel import GuinierModel
         self.shape_indep_list.append(GuinierModel )
         
-        from sans.models.FractalModel import FractalModel
-        self.shape_indep_list.append(FractalModel )
-        
+        from sans.models.GuinierPorodModel import GuinierPorodModel
+        self.shape_indep_list.append(GuinierPorodModel )
+
         from sans.models.LorentzModel import LorentzModel
         self.shape_indep_list.append( LorentzModel) 
@@ -314 +356 @@
         from sans.models.Poly_GaussCoil import Poly_GaussCoil
         self.shape_indep_list.append(Poly_GaussCoil)
-                 
+        
+        from sans.models.PolymerExclVolume import PolymerExclVolume
+        self.shape_indep_list.append(PolymerExclVolume)
+        
         from sans.models.PorodModel import PorodModel
-        self.shape_indep_list.append(PorodModel )
-        
-        #FractalModel (a c-model)will be used.
-        #from sans.models.FractalAbsModel import FractalAbsModel
-        #self.shape_indep_list.append(FractalAbsModel)
+        self.shape_indep_list.append(PorodModel )      
+        
+        from sans.models.RPA10Model import RPA10Model
+        self.shape_indep_list.append(RPA10Model)
+        self.multi_func_list.append(RPA10Model)
         
         from sans.models.TeubnerStreyModel import TeubnerStreyModel
         self.shape_indep_list.append(TeubnerStreyModel )
         
+        from sans.models.TwoLorentzianModel import TwoLorentzianModel
+        self.shape_indep_list.append(TwoLorentzianModel )
+        
+        from sans.models.TwoPowerLawModel import TwoPowerLawModel
+        self.shape_indep_list.append(TwoPowerLawModel )
+        
+        from sans.models.UnifiedPowerRgModel import UnifiedPowerRgModel
+        self.shape_indep_list.append(UnifiedPowerRgModel )
+        self.multi_func_list.append(UnifiedPowerRgModel)
+        
         from sans.models.LineModel import LineModel
         self.shape_indep_list.append(LineModel)
+        
+        from sans.models.ReflectivityModel import ReflectivityModel
+        self.multi_func_list.append(ReflectivityModel)
     
         #Looking for plugins
         self.plugins = findModels()
-       
+        self._get_multifunc_models()
+        self.plugins.append(ReflectivityModel)
         return 0
 
@@ -347 +406 @@
         self.model_combobox.set_list("Multi-Functions", self.multi_func_list)
         return self.model_combobox
- 
+        
+    def _get_multifunc_models(self):
+        """
+        Get the multifunctional models
+        """
+        for item in self.plugins:
+            try:
+                # check the multiplicity if any
+                if item.multiplicity_info[0] > 1:
+                    self.multi_func_list.append(item)
+            except:
+                # pass to other items
+                pass

theoryview/perspectives/theory/pagestate.py

@@ -41 +41 @@
         # Contains link between  model ,all its parameters, and panel organization
         self.parameters =[]
+        # String parameter list that can not be fitted
+        self.str_parameters = []
         # Contains list of parameters that cannot be fitted and reference to 
         #panel objects 
@@ -124 +126 @@
         obj.enable2D = copy.deepcopy(self.enable2D)
         obj.parameters = copy.deepcopy(self.parameters)
+        obj.str_parameters = copy.deepcopy(self.str_parameters)
         obj.fixed_param = copy.deepcopy(self.fixed_param)
         obj.fittable_param = copy.deepcopy(self.fittable_param)
@@ -181 +184 @@
             rep += "maximum value : %s \n"%str(item[6][1])
             rep += "parameter unit: %s\n\n"%str(item[7])
+        rep += "number str_parameters(self.str_parameters): %s\n"%len(self.str_parameters)
         rep +="number orientation parameters"
         rep +="(self.orientation_params): %s\n"%len(self.orientation_params)

theoryview/perspectives/theory/profile_dialog.py

@@ -2 +2 @@
 import sys
 
-import copy,numpy
+from copy import deepcopy
 from danse.common.plottools.PlotPanel import PlotPanel
 from danse.common.plottools.plottables import Graph
@@ -17 +17 @@
 if sys.platform.count("win32")>0:
     _STATICBOX_WIDTH = 380
-    PANEL_SIZE = 420
+    PANEL_SIZE = 475
     FONT_VARIANT = 0
 else:
     _STATICBOX_WIDTH = 410
-    PANEL_SIZE = 450
+    PANEL_SIZE = 505
     FONT_VARIANT = 1
     
@@ -36 +36 @@
     ## Flag to tell the AUI manager to put this panel in the center pane
     CENTER_PANE = True
-    def __init__(self, parent=None,base=None,data =None, id = -1, *args, **kwds):
+    def __init__(self, parent=None,base=None,data =None,axes =['Radius'], id = -1, *args, **kwds):
         kwds["style"] =  wx.DEFAULT_DIALOG_STYLE
-        kwds["size"] = wx.Size(_STATICBOX_WIDTH*2,PANEL_SIZE) 
+        kwds["size"] = wx.Size(_STATICBOX_WIDTH*1.5,PANEL_SIZE) 
         wx.Dialog.__init__(self, parent, id = id,  *args, **kwds)
         if data != None:
@@ -54 +54 @@
             self.name = self.data.name
             
-            # Panel for 2D plot
-            self.plotpanel    = SLDplotpanel(self, -1, style=wx.TRANSPARENT_WINDOW)
+            # Panel for plot
+            self.plotpanel    = SLDplotpanel(self, axes, -1, style=wx.TRANSPARENT_WINDOW)
             self.cmap = DEFAULT_CMAP
             ## Create Artist and bind it
@@ -61 +61 @@
 
             self._setup_layout()
-            self.newplot=Theory1D(self.data.x,self.data.y)
+            data_plot = deepcopy(self.data)
+            self.newplot=Theory1D(data_plot.x,data_plot.y)
             self.newplot.name = 'SLD'
             self.plotpanel.add_image(self.newplot) 
@@ -76 +77 @@
         sizer = wx.GridBagSizer(14,14)
         
-        sizer.Add(self.plotpanel,(0, 0), (13, 13), wx.EXPAND | wx.LEFT| wx.RIGHT, 15)
+        sizer.Add(self.plotpanel,(0, 0), (13, 13), wx.EXPAND | wx.LEFT| wx.RIGHT, 1)
 
         #-----Button------------1
@@ -110 +111 @@
     Panel
     """
-    def __init__(self, parent, id = -1, color = None, dpi = None, **kwargs):
+    def __init__(self, parent,axes=[], id = -1, color = None, dpi = None, **kwargs):
         """
         """
@@ -120 +121 @@
         self.plots = {}
         self.graph = Graph()
-
-
+        self.axes_label = []
+        for idx in range(0,len(axes)):
+            self.axes_label.append(axes[idx])
          
     def add_image(self, plot):
@@ -133 +135 @@
         self.graph.add(plot)
         #add axes
-        self.graph.xaxis('\\rm{Radius} ', '\\AA')
+        x1_label = self.axes_label[0]
+        self.graph.xaxis('\\rm{%s} '% x1_label, '\\AA')
         self.graph.yaxis('\\rm{SLD} ', '\\AA^{-2}')