Changeset ce07fa8 in sasview for sansview/perspectives


Ignore:
Timestamp:
Apr 12, 2010 12:39:08 PM (15 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:
018a0bd
Parents:
19107f0
Message:

added more models

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sansview/perspectives/fitting/models.py

    r81bece4 rce07fa8  
    166166        self.multiplication_factor.append(SphereModel) 
    167167         
     168        from sans.models.FuzzySphereModel import FuzzySphereModel 
     169        self.shape_list.append(FuzzySphereModel) 
     170        self.multiplication_factor.append(FuzzySphereModel) 
     171         
    168172        from sans.models.CoreShellModel import CoreShellModel 
    169173        self.shape_list.append(CoreShellModel) 
    170174        self.multiplication_factor.append(CoreShellModel) 
     175 
     176        from sans.models.CoreFourShellModel import CoreFourShellModel 
     177        self.shape_list.append(CoreFourShellModel) 
     178        self.multiplication_factor.append(CoreFourShellModel) 
    171179         
    172180        from sans.models.VesicleModel import VesicleModel 
     
    196204        self.shape_list.append(FlexibleCylinderModel) 
    197205 
     206        from sans.models.FlexCylEllipXModel import FlexCylEllipXModel 
     207        self.shape_list.append(FlexCylEllipXModel) 
    198208         
    199209        from sans.models.StackedDisksModel import StackedDisksModel 
     
    248258         
    249259        ##shape-independent models 
     260             
     261        from sans.models.PowerLawAbsModel import PowerLawAbsModel 
     262        self.shape_indep_list.append( PowerLawAbsModel ) 
     263         
    250264        from sans.models.BEPolyelectrolyte import BEPolyelectrolyte 
    251265        self.shape_indep_list.append(BEPolyelectrolyte ) 
    252266        self.form_factor_dict[str(wx.NewId())] =  [SphereModel] 
     267 
    253268        from sans.models.DABModel import DABModel 
    254269        self.shape_indep_list.append(DABModel ) 
    255270         
     271        from sans.models.DebyeModel import DebyeModel 
     272        self.shape_indep_list.append(DebyeModel ) 
     273         
    256274        from sans.models.GuinierModel import GuinierModel 
    257275        self.shape_indep_list.append(GuinierModel ) 
    258276         
    259         from sans.models.DebyeModel import DebyeModel 
    260         self.shape_indep_list.append(DebyeModel ) 
    261          
     277        from sans.models.FractalModel import FractalModel 
     278        self.shape_indep_list.append(FractalModel ) 
     279         
     280        from sans.models.LorentzModel import LorentzModel 
     281        self.shape_indep_list.append( LorentzModel)  
     282         
     283        from sans.models.PeakGaussModel import PeakGaussModel 
     284        self.shape_indep_list.append(PeakGaussModel) 
     285         
     286        from sans.models.PeakLorentzModel import PeakLorentzModel 
     287        self.shape_indep_list.append(PeakLorentzModel) 
     288         
     289        from sans.models.Poly_GaussCoil import Poly_GaussCoil 
     290        self.shape_indep_list.append(Poly_GaussCoil) 
     291                  
    262292        from sans.models.PorodModel import PorodModel 
    263293        self.shape_indep_list.append(PorodModel ) 
    264294         
    265         from sans.models.PeakGaussModel import PeakGaussModel 
    266         self.shape_indep_list.append(PeakGaussModel) 
    267          
    268         from sans.models.PeakLorentzModel import PeakLorentzModel 
    269         self.shape_indep_list.append(PeakLorentzModel) 
    270          
    271         from sans.models.FractalAbsModel import FractalAbsModel 
    272         self.shape_indep_list.append(FractalAbsModel) 
    273          
    274         from sans.models.LorentzModel import LorentzModel 
    275         self.shape_indep_list.append( LorentzModel)  
    276              
    277         from sans.models.PowerLawAbsModel import PowerLawAbsModel 
    278         self.shape_indep_list.append( PowerLawAbsModel ) 
     295         
     296        #FractalModel (a c-model)will be used. 
     297        #from sans.models.FractalAbsModel import FractalAbsModel 
     298        #self.shape_indep_list.append(FractalAbsModel) 
    279299         
    280300        from sans.models.TeubnerStreyModel import TeubnerStreyModel 
     
    283303        from sans.models.LineModel import LineModel 
    284304        self.shape_indep_list.append(LineModel) 
     305 
    285306     
    286307        #Looking for plugins 
Note: See TracChangeset for help on using the changeset viewer.