Changeset 836fe6e in sasview for sansmodels/src/sans/models/CoreShellCylinderModel.py

Timestamp:

Jan 29, 2009 5:34:59 PM (15 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:

da3dae3

Parents:

1f3655a

Message:

c_model wrappergenerator modified…
self.fixed list added to model

File:

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

sansmodels/src/sans/models/CoreShellCylinderModel.py

@@ -17 +17 @@
 
         WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY
-                 DO NOT MODIFY THIS FILE, MODIFY ../c_extensions/core_shell_cylinder.h
+                 DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\core_shell_cylinder.h
                  AND RE-RUN THE GENERATOR SCRIPT
 
@@ -28 +28 @@
 class CoreShellCylinderModel(CCoreShellCylinderModel, BaseComponent):
     """ Class that evaluates a CoreShellCylinderModel model. 
-        This file was auto-generated from ../c_extensions/core_shell_cylinder.h.
+        This file was auto-generated from ..\c_extensions\core_shell_cylinder.h.
         Refer to that file and the structure it contains
         for details of the model.
@@ -54 +54 @@
         ## Name of the model
         self.name = "CoreShellCylinderModel"
+        ## Model description
         self.description ="""P(q,alpha)= scale/Vs*f(q)^(2) + bkg  Where:\n\
                 f(q)= 2(core_sld- solvant_sld)* Vc*sin[qLcos(alpha/2)]/\n\
@@ -72 +73 @@
                 theta: axis_theta of the cylinder
                 phi: the axis_phi of the cylinder"""
+       
                 ## Parameter details [units, min, max]
         self.details = {}
@@ -84 +86 @@
         self.details['axis_theta'] = ['rad', None, None]
         self.details['axis_phi'] = ['rad', None, None]
-        # fixed paramaters
-        self.fixed=['axis_phi.npts','axis_phi.nsigmas',
-                                    'axis_theta.npts','axis_theta.nsigmas',
-                                    'length.npts','length.nsigmas',
-                                    'radius.npts','radius.nsigmas',
-                                    'thickness.npts','thickness.nsigmas' ]
+
+                ## fittable parameters
+        self.fixed=['axis_phi.width', 'axis_theta.width', 'length.width', 'radius.width', 'thickness_width']
    
     def clone(self):