Changeset 996fd35 in sasview for sansmodels/src/sans/models


Ignore:
Timestamp:
Mar 11, 2009 7:03:15 PM (16 years ago)
Author:
Gervaise Alina <gervyh@…>
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:
6df36b3
Parents:
c9636f7
Message:

name change from 2 model

Location:
sansmodels/src/sans/models
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sansmodels/src/sans/models/MultiplicationModel.py

    rc9636f7 r996fd35  
    1212        BaseComponent.__init__(self) 
    1313 
     14        
     15        ## Name of the model 
     16        self.name="" 
     17        ## model description 
     18        self.description="" 
     19        if  model1.name != "NoStructure"and  model2.name != "NoStructure": 
     20             self.name = model1.name +" * "+ model2.name 
     21             self.description= self.name+"\n" 
     22             self.description +="see %s description and %s description"%( model1.name, 
     23                                                                         model2.name ) 
     24        elif  model2.name != "NoStructure": 
     25            self.name = model2.name 
     26            self.description= model2.description 
     27        else : 
     28            self.name = model1.name 
     29            self.description= model1.description 
     30   
    1431         
    15         ## Name of the model 
    16         self.name = model1.name +" * "+ model2.name 
    17         ## model description 
    18         self.description= model1.name +" * "+ model2.name 
    19         self.description +="see %s description and %s description"%(model1.name, 
    20                                                                      model2.name) 
     32         
    2133        self.model1= model1 
    2234        self.model2= model2 
  • sansmodels/src/sans/models/pluginmodel.py

    r5f89fb8 r996fd35  
    44class Model1DPlugin(BaseComponent): 
    55    ## Name of the model 
    6     name = "Plugin Model" 
    7  
    8     def __init__(self): 
     6    
     7    def __init__(self , name="Plugin Model" ): 
    98        """ Initialization """ 
    109        BaseComponent.__init__(self) 
     10        self.name = name 
    1111        self.details = {} 
    1212        self.params  = {} 
Note: See TracChangeset for help on using the changeset viewer.