Changeset 9316609 in sasview for sansmodels/src/sans/models/EllipsoidModel.py

Timestamp:

Oct 28, 2008 3:22:22 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:

92320e5

Parents:

89fef2c

Message:

added description to model

File:

• sansmodels/src/sans/models/EllipsoidModel.py (modified) (5 diffs)

sansmodels/src/sans/models/EllipsoidModel.py

@@ -1 +1 @@
 #!/usr/bin/env python
-"""
-        This software was developed by the University of Tennessee as part of the
-        Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
-        project funded by the US National Science Foundation.
-
-        If you use DANSE applications to do scientific research that leads to
-        publication, we ask that you acknowledge the use of the software with the
-        following sentence:
-
-        "This work benefited from DANSE software developed under NSF award DMR-0520547."
-
-        copyright 2008, University of Tennessee
-"""
-
 """ Provide functionality for a C extension model
 
         WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY
-                 DO NOT MODIFY THIS FILE, MODIFY ../c_extensions/ellipsoid.h
+                 DO NOT MODIFY THIS FILE, MODIFY ellipsoid.h
                  AND RE-RUN THE GENERATOR SCRIPT
 
+    @author: Mathieu Doucet / UTK
+    @contact: mathieu.doucet@nist.gov
 """
 
@@ -28 +16 @@
 class EllipsoidModel(CEllipsoidModel, BaseComponent):
     """ Class that evaluates a EllipsoidModel model. 
-        This file was auto-generated from ../c_extensions/ellipsoid.h.
+        This file was auto-generated from ellipsoid.h.
         Refer to that file and the structure it contains
         for details of the model.
@@ -51 +39 @@
         ## Name of the model
         self.name = "EllipsoidModel"
-        
+        self.description= """"P(q.alpha)= scale*f(q)^(2)+ bkg\n\
+                f(q)= 3*(scatter_sld- scatter_solvent)*V*[sin(q*r(Ra,Rb,alpha)) - q*r*cos(qr(Ra,Rb,alpha))]
+                /[qr(Ra,Rb,alpha)]^(3)"
+                r(Ra,Rb,alpha)= [Rb^(2)*(sin(alpha))^(2) + Ra^(2)*(cos(alpha))^(2)]^(1/2)
+                scatter_sld: scattering length density of the scatter
+                solvent_sld: scattering length density of the solvent
+                V: volune of the Eliipsoid
+                Ra: radius along the rotation axis of the Ellipsoid
+                Rb: radius perpendicular to the rotation axis of the ellipsoid"""
                 ## Parameter details [units, min, max]
         self.details = {}
@@ -65 +61 @@
     def clone(self):
         """ Return a identical copy of self """
-        return self._clone(EllipsoidModel())   
+        obj = EllipsoidModel()
+        obj.params = copy.deepcopy(self.params)
+        return obj   
    
     def run(self, x = 0.0):
@@ -82 +80 @@
         
         return CEllipsoidModel.runXY(self, x)
-        
-    def set_dispersion(self, parameter, dispersion):
-        """
-            Set the dispersion object for a model parameter
-            @param parameter: name of the parameter [string]
-            @dispersion: dispersion object of type DispersionModel
-        """
-        return CEllipsoidModel.set_dispersion(self, parameter, dispersion.cdisp)
-        
    
 # End of file