Changeset 0f5bc9f in sasview for sansmodels/src
- Timestamp:
- Aug 19, 2008 2:42:22 PM (16 years ago)
- 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:
- d30fdde
- Parents:
- a86bbe9
- Location:
- sansmodels/src
- Files:
-
- 12 added
- 17 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
sansmodels/src/sans/models/CoreShellCylinderModel.py
rae3ce4e r0f5bc9f 1 1 #!/usr/bin/env python 2 """ 3 This software was developed by the University of Tennessee as part of the 4 Distributed Data Analysis of Neutron Scattering Experiments (DANSE) 5 project funded by the US National Science Foundation. 6 7 If you use DANSE applications to do scientific research that leads to 8 publication, we ask that you acknowledge the use of the software with the 9 following sentence: 10 11 "This work benefited from DANSE software developed under NSF award DMR-0520547." 12 13 copyright 2008, University of Tennessee 14 """ 15 2 16 """ Provide functionality for a C extension model 3 17 4 18 WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY 5 DO NOT MODIFY THIS FILE, MODIFY core_shell_cylinder.h19 DO NOT MODIFY THIS FILE, MODIFY ../c_extensions/core_shell_cylinder.h 6 20 AND RE-RUN THE GENERATOR SCRIPT 7 21 8 @author: Mathieu Doucet / UTK9 @contact: mathieu.doucet@nist.gov10 22 """ 11 23 … … 16 28 class CoreShellCylinderModel(CCoreShellCylinderModel, BaseComponent): 17 29 """ Class that evaluates a CoreShellCylinderModel model. 18 This file was auto-generated from core_shell_cylinder.h.30 This file was auto-generated from ../c_extensions/core_shell_cylinder.h. 19 31 Refer to that file and the structure it contains 20 32 for details of the model. … … 78 90 79 91 return CCoreShellCylinderModel.runXY(self, x) 92 93 def set_dispersion(self, parameter, dispersion): 94 """ 95 Set the dispersion object for a model parameter 96 @param parameter: name of the parameter [string] 97 @dispersion: dispersion object of type DispersionModel 98 """ 99 return CCoreShellCylinderModel.set_dispersion(self, parameter, dispersion.cdisp) 100 80 101 81 102 # End of file -
sansmodels/src/sans/models/CoreShellModel.py
rae3ce4e r0f5bc9f 1 1 #!/usr/bin/env python 2 """ 3 This software was developed by the University of Tennessee as part of the 4 Distributed Data Analysis of Neutron Scattering Experiments (DANSE) 5 project funded by the US National Science Foundation. 6 7 If you use DANSE applications to do scientific research that leads to 8 publication, we ask that you acknowledge the use of the software with the 9 following sentence: 10 11 "This work benefited from DANSE software developed under NSF award DMR-0520547." 12 13 copyright 2008, University of Tennessee 14 """ 15 2 16 """ Provide functionality for a C extension model 3 17 4 18 WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY 5 DO NOT MODIFY THIS FILE, MODIFY core_shell.h19 DO NOT MODIFY THIS FILE, MODIFY ../c_extensions/core_shell.h 6 20 AND RE-RUN THE GENERATOR SCRIPT 7 21 8 @author: Mathieu Doucet / UTK9 @contact: mathieu.doucet@nist.gov10 22 """ 11 23 … … 16 28 class CoreShellModel(CCoreShellModel, BaseComponent): 17 29 """ Class that evaluates a CoreShellModel model. 18 This file was auto-generated from core_shell.h.30 This file was auto-generated from ../c_extensions/core_shell.h. 19 31 Refer to that file and the structure it contains 20 32 for details of the model. … … 72 84 73 85 return CCoreShellModel.runXY(self, x) 86 87 def set_dispersion(self, parameter, dispersion): 88 """ 89 Set the dispersion object for a model parameter 90 @param parameter: name of the parameter [string] 91 @dispersion: dispersion object of type DispersionModel 92 """ 93 return CCoreShellModel.set_dispersion(self, parameter, dispersion.cdisp) 94 74 95 75 96 # End of file -
sansmodels/src/sans/models/EllipsoidModel.py
rae3ce4e r0f5bc9f 1 1 #!/usr/bin/env python 2 """ 3 This software was developed by the University of Tennessee as part of the 4 Distributed Data Analysis of Neutron Scattering Experiments (DANSE) 5 project funded by the US National Science Foundation. 6 7 If you use DANSE applications to do scientific research that leads to 8 publication, we ask that you acknowledge the use of the software with the 9 following sentence: 10 11 "This work benefited from DANSE software developed under NSF award DMR-0520547." 12 13 copyright 2008, University of Tennessee 14 """ 15 2 16 """ Provide functionality for a C extension model 3 17 4 18 WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY 5 DO NOT MODIFY THIS FILE, MODIFY ellipsoid.h19 DO NOT MODIFY THIS FILE, MODIFY ../c_extensions/ellipsoid.h 6 20 AND RE-RUN THE GENERATOR SCRIPT 7 21 8 @author: Mathieu Doucet / UTK9 @contact: mathieu.doucet@nist.gov10 22 """ 11 23 … … 16 28 class EllipsoidModel(CEllipsoidModel, BaseComponent): 17 29 """ Class that evaluates a EllipsoidModel model. 18 This file was auto-generated from ellipsoid.h.30 This file was auto-generated from ../c_extensions/ellipsoid.h. 19 31 Refer to that file and the structure it contains 20 32 for details of the model. … … 72 84 73 85 return CEllipsoidModel.runXY(self, x) 86 87 def set_dispersion(self, parameter, dispersion): 88 """ 89 Set the dispersion object for a model parameter 90 @param parameter: name of the parameter [string] 91 @dispersion: dispersion object of type DispersionModel 92 """ 93 return CEllipsoidModel.set_dispersion(self, parameter, dispersion.cdisp) 94 74 95 75 96 # End of file -
sansmodels/src/sans/models/EllipticalCylinderModel.py
rae3ce4e r0f5bc9f 1 1 #!/usr/bin/env python 2 """ 3 This software was developed by the University of Tennessee as part of the 4 Distributed Data Analysis of Neutron Scattering Experiments (DANSE) 5 project funded by the US National Science Foundation. 6 7 If you use DANSE applications to do scientific research that leads to 8 publication, we ask that you acknowledge the use of the software with the 9 following sentence: 10 11 "This work benefited from DANSE software developed under NSF award DMR-0520547." 12 13 copyright 2008, University of Tennessee 14 """ 15 2 16 """ Provide functionality for a C extension model 3 17 4 18 WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY 5 DO NOT MODIFY THIS FILE, MODIFY elliptical_cylinder.h19 DO NOT MODIFY THIS FILE, MODIFY ../c_extensions/elliptical_cylinder.h 6 20 AND RE-RUN THE GENERATOR SCRIPT 7 21 8 @author: Mathieu Doucet / UTK9 @contact: mathieu.doucet@nist.gov10 22 """ 11 23 … … 16 28 class EllipticalCylinderModel(CEllipticalCylinderModel, BaseComponent): 17 29 """ Class that evaluates a EllipticalCylinderModel model. 18 This file was auto-generated from elliptical_cylinder.h.30 This file was auto-generated from ../c_extensions/elliptical_cylinder.h. 19 31 Refer to that file and the structure it contains 20 32 for details of the model. … … 76 88 77 89 return CEllipticalCylinderModel.runXY(self, x) 90 91 def set_dispersion(self, parameter, dispersion): 92 """ 93 Set the dispersion object for a model parameter 94 @param parameter: name of the parameter [string] 95 @dispersion: dispersion object of type DispersionModel 96 """ 97 return CEllipticalCylinderModel.set_dispersion(self, parameter, dispersion.cdisp) 98 78 99 79 100 # End of file -
sansmodels/src/sans/models/SphereModel.py
rae3ce4e r0f5bc9f 1 1 #!/usr/bin/env python 2 """ 3 This software was developed by the University of Tennessee as part of the 4 Distributed Data Analysis of Neutron Scattering Experiments (DANSE) 5 project funded by the US National Science Foundation. 6 7 If you use DANSE applications to do scientific research that leads to 8 publication, we ask that you acknowledge the use of the software with the 9 following sentence: 10 11 "This work benefited from DANSE software developed under NSF award DMR-0520547." 12 13 copyright 2008, University of Tennessee 14 """ 15 2 16 """ Provide functionality for a C extension model 3 17 4 18 WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY 5 DO NOT MODIFY THIS FILE, MODIFY sphere.h19 DO NOT MODIFY THIS FILE, MODIFY ../c_extensions/sphere.h 6 20 AND RE-RUN THE GENERATOR SCRIPT 7 21 8 @author: Mathieu Doucet / UTK9 @contact: mathieu.doucet@nist.gov10 22 """ 11 23 … … 16 28 class SphereModel(CSphereModel, BaseComponent): 17 29 """ Class that evaluates a SphereModel model. 18 This file was auto-generated from sphere.h.30 This file was auto-generated from ../c_extensions/sphere.h. 19 31 Refer to that file and the structure it contains 20 32 for details of the model. … … 66 78 67 79 return CSphereModel.runXY(self, x) 80 81 def set_dispersion(self, parameter, dispersion): 82 """ 83 Set the dispersion object for a model parameter 84 @param parameter: name of the parameter [string] 85 @dispersion: dispersion object of type DispersionModel 86 """ 87 return CSphereModel.set_dispersion(self, parameter, dispersion.cdisp) 88 68 89 69 90 # End of file -
sansmodels/src/sans/models/c_extensions/c_models.cpp
raf03ddd r0f5bc9f 9 9 10 10 void addCCylinderModel(PyObject *module); 11 void addCSphereModel(PyObject *module); 12 void addCCoreShellModel(PyObject *module); 13 void addCCoreShellCylinderModel(PyObject *module); 14 void addCEllipsoidModel(PyObject *module); 15 void addCEllipticalCylinderModel(PyObject *module); 16 11 17 extern "C" { 12 void addCCoreShellCylinderModel(PyObject *module);13 void addCCoreShellModel(PyObject *module);14 void addCEllipsoidModel(PyObject *module);15 void addCSphereModel(PyObject *module);16 void addCEllipticalCylinderModel(PyObject *module);18 //void addCCoreShellCylinderModel(PyObject *module); 19 //void addCCoreShellModel(PyObject *module); 20 //void addCEllipsoidModel(PyObject *module); 21 //void addCSphereModel(PyObject *module); 22 //void addCEllipticalCylinderModel(PyObject *module); 17 23 void addDisperser(PyObject *module); 18 24 void addCGaussian(PyObject *module); -
sansmodels/src/sans/models/c_extensions/core_shell.h
rae3ce4e r0f5bc9f 2 2 #define core_shell_h 3 3 4 /** 5 * Structure definition for core-shell parameters 4 /** 5 * Structure definition for core-shell parameters 6 6 */ 7 7 //[PYTHONCLASS] = CoreShellModel 8 //[DISP_PARAMS] = radius, thickness 8 9 typedef struct { 9 /// Scale factor 10 /// Scale factor 10 11 // [DEFAULT]=scale=1.0 11 12 double scale; … … 27 28 /// Incoherent Background (cm-1) 0.000 28 29 // [DEFAULT]=background=0 cm-1 29 double background; 30 double background; 30 31 } CoreShellParameters; 31 32 -
sansmodels/src/sans/models/c_extensions/core_shell_cylinder.h
rae3ce4e r0f5bc9f 2 2 #define core_shell_cylinder_h 3 3 4 /** 5 * Structure definition for core-shell cylinder parameters 4 /** 5 * Structure definition for core-shell cylinder parameters 6 6 */ 7 7 //[PYTHONCLASS] = CoreShellCylinderModel 8 //[DISP_PARAMS] = radius, thickness, length, axis_theta, axis_phi 8 9 typedef struct { 9 /// Scale factor 10 /// Scale factor 10 11 // [DEFAULT]=scale=1.0 11 12 double scale; 12 13 13 14 /// Core radius [A] 14 15 // [DEFAULT]=radius=20.0 A 15 16 double radius; 16 17 17 18 /// Shell thickness [A] 18 19 // [DEFAULT]=thickness=10.0 A 19 20 double thickness; 20 21 21 22 /// Core length [A] 22 23 // [DEFAULT]=length=400.0 A 23 24 double length; 24 25 25 26 /// Core SLD [A-2] 26 27 // [DEFAULT]=core_sld=1.0e-6 A-2 27 28 double core_sld; 28 29 29 30 /// Shell SLD [A-2] 30 31 // [DEFAULT]=shell_sld=4.0e-6 A-2 31 32 double shell_sld; 32 33 33 34 /// Solvent SLD [A-2] 34 35 // [DEFAULT]=solvent_sld=1.0e-6 A-2 35 36 double solvent_sld; 36 37 37 38 /// Incoherent Background [cm-1] 38 39 // [DEFAULT]=background=0 cm-1 39 double background; 40 40 double background; 41 41 42 /// Orientation of the long axis of the core-shell cylinder w/respect incoming beam [rad] 42 43 // [DEFAULT]=axis_theta=1.57 rad 43 44 double axis_theta; 44 45 45 46 /// Orientation of the long axis of the core-shell cylinder in the plane of the detector [rad] 46 47 // [DEFAULT]=axis_phi=0.0 rad 47 double axis_phi; 48 48 double axis_phi; 49 49 50 } CoreShellCylinderParameters; 50 51 -
sansmodels/src/sans/models/c_extensions/ellipsoid.h
rae3ce4e r0f5bc9f 2 2 #define ellipsoid_h 3 3 4 /** 5 * Structure definition for ellipsoid parameters 4 /** 5 * Structure definition for ellipsoid parameters 6 6 * The ellipsoid has axes radius_b, radius_b, radius_a. 7 7 * Ref: Jan Skov Pedersen, Advances in Colloid and Interface Science, 70 (1997) 171-210 8 8 */ 9 9 //[PYTHONCLASS] = EllipsoidModel 10 //[DISP_PARAMS] = radius_a, radius_b, axis_theta, axis_phi 10 11 typedef struct { 11 /// Scale factor 12 /// Scale factor 12 13 // [DEFAULT]=scale=1.0 13 14 double scale; 14 15 /// Rotation axis radius_a [A] 15 16 /// Rotation axis radius_a [A] 16 17 // [DEFAULT]=radius_a=20.0 A 17 18 double radius_a; 18 19 /// Radius_b [A] 19 20 /// Radius_b [A] 20 21 // [DEFAULT]=radius_b=400 A 21 22 double radius_b; 22 23 /// Contrast [Å-2] 23 24 /// Contrast [Å-2] 24 25 // [DEFAULT]=contrast=3.0e-6 A-2 25 26 double contrast; 26 27 27 28 /// Incoherent Background [cm-1] 28 29 // [DEFAULT]=background=0 cm-1 29 double background; 30 30 double background; 31 31 32 /// Orientation of the long axis of the ellipsoid w/respect incoming beam [rad] 32 33 // [DEFAULT]=axis_theta=1.57 rad … … 34 35 /// Orientation of the long axis of the ellipsoid in the plane of the detector [rad] 35 36 // [DEFAULT]=axis_phi=0.0 rad 36 double axis_phi; 37 double axis_phi; 37 38 } EllipsoidParameters; 38 39 -
sansmodels/src/sans/models/c_extensions/elliptical_cylinder.h
rae3ce4e r0f5bc9f 2 2 #define ell_cylinder_h 3 3 4 /** Structure definition for cylinder parameters 4 /** Structure definition for cylinder parameters 5 5 * [PYTHONCLASS] = EllipticalCylinderModel 6 * [DISP_PARAMS] = r_minor, r_ratio, length, cyl_theta, cyl_phi, cyl_psi 7 * 6 8 * */ 7 9 typedef struct { 8 /// Scale factor 10 /// Scale factor 9 11 // [DEFAULT]=scale=1.0 10 12 double scale; … … 23 25 /// Incoherent Background (cm-1) 0.000 24 26 // [DEFAULT]=background=0 cm-1 25 double background; 27 double background; 26 28 /// Orientation of the cylinder axis w/respect incoming beam [rad] 27 29 // [DEFAULT]=cyl_theta=1.57 rad … … 29 31 /// Orientation of the cylinder in the plane of the detector [rad] 30 32 // [DEFAULT]=cyl_phi=0.0 rad 31 double cyl_phi; 33 double cyl_phi; 32 34 /// Orientation of major radius of the cross-section w/respect vector q [rad] 33 35 // [DEFAULT]=cyl_psi=0.0 rad 34 double cyl_psi; 36 double cyl_psi; 35 37 } EllipticalCylinderParameters; 36 38 -
sansmodels/src/sans/models/c_extensions/sphere.h
rae3ce4e r0f5bc9f 2 2 #define sphere_h 3 3 4 /** 5 * Structure definition for sphere parameters 4 /** 5 * Structure definition for sphere parameters 6 6 */ 7 7 //[PYTHONCLASS] = SphereModel 8 //[DISP_PARAMS] = radius 8 9 typedef struct { 9 /// Scale factor 10 /// Scale factor 10 11 // [DEFAULT]=scale=1.0e-6 11 12 double scale; 12 13 /// Radius of sphere [A] 13 14 /// Radius of sphere [A] 14 15 // [DEFAULT]=radius=60.0 A 15 16 double radius; 16 17 /// Contrast [Å-2] 17 18 /// Contrast [Å-2] 18 19 // [DEFAULT]=contrast=1.0 A-2 19 20 double contrast; 20 21 21 22 /// Incoherent Background [cm-1] 22 23 // [DEFAULT]=background=0 cm-1 23 double background; 24 double background; 24 25 } SphereParameters; 25 26 -
sansmodels/src/sans/models/c_models/CCylinderModel.cpp
raf03ddd r0f5bc9f 83 83 84 84 // Initialize parameter dictionary 85 PyDict_SetItemString(self->params,"scale",Py_BuildValue("d", self->model->scale()));86 PyDict_SetItemString(self->params,"length",Py_BuildValue("d", self->model->length()));87 PyDict_SetItemString(self->params,"cyl_theta",Py_BuildValue("d", self->model->cyl_theta()));88 PyDict_SetItemString(self->params,"background",Py_BuildValue("d", self->model->background()));89 PyDict_SetItemString(self->params,"radius",Py_BuildValue("d", self->model->radius()));90 PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d", self->model->contrast()));91 PyDict_SetItemString(self->params,"cyl_phi",Py_BuildValue("d", self->model->cyl_phi()));85 PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000)); 86 PyDict_SetItemString(self->params,"length",Py_BuildValue("d",400.000000)); 87 PyDict_SetItemString(self->params,"cyl_theta",Py_BuildValue("d",1.000000)); 88 PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000)); 89 PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",20.000000)); 90 PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.000003)); 91 PyDict_SetItemString(self->params,"cyl_phi",Py_BuildValue("d",1.000000)); 92 92 // Initialize dispersion / averaging parameter dict 93 93 DispersionVisitor* visitor = new DispersionVisitor(); -
sansmodels/src/sans/models/c_models/WrapperGenerator.py
raf03ddd r0f5bc9f 213 213 param_str = "// Initialize parameter dictionary\n" 214 214 for par in self.params: 215 param_str += " PyDict_SetItemString(self->params,\"%s\",Py_BuildValue(\"d\", self->model->%s()));\n" % \216 (par, par)215 param_str += " PyDict_SetItemString(self->params,\"%s\",Py_BuildValue(\"d\",%f));\n" % \ 216 (par, self.params[par]) 217 217 218 218 param_str += " // Initialize dispersion / averaging parameter dict\n" -
sansmodels/src/sans/models/c_models/cylinder.cpp
raf03ddd r0f5bc9f 189 189 190 190 printf("Length = %g\n", c.length()); 191 printf("I(Qx=%g,Qy=%g) = %g\n", 0.001, 0.001, c(0.001, 0.001)); 191 192 printf("I(Q=%g) = %g\n", 0.001, c(0.001)); 192 193 c.radius.dispersion = new GaussianDispersion(); -
sansmodels/src/sans/models/c_models/models.hh
raf03ddd r0f5bc9f 24 24 25 25 class CylinderModel{ 26 27 26 public: 28 27 // Model parameters … … 34 33 Parameter cyl_theta; 35 34 Parameter cyl_phi; 36 // TODO: replace this by an array of parameters37 35 38 36 // Constructor … … 45 43 }; 46 44 45 class SphereModel{ 46 public: 47 // Model parameters 48 Parameter radius; 49 Parameter scale; 50 Parameter contrast; 51 Parameter background; 52 53 // Constructor 54 SphereModel(); 55 56 // Operators to get I(Q) 57 double operator()(double q); 58 double operator()(double qx, double qy); 59 double evaluate_rphi(double q, double phi); 60 }; 61 62 class CoreShellModel{ 63 public: 64 // Model parameters 65 Parameter radius; 66 Parameter scale; 67 Parameter thickness; 68 Parameter core_sld; 69 Parameter shell_sld; 70 Parameter solvent_sld; 71 Parameter background; 72 73 // Constructor 74 CoreShellModel(); 75 76 // Operators to get I(Q) 77 double operator()(double q); 78 double operator()(double qx, double qy); 79 double evaluate_rphi(double q, double phi); 80 }; 81 82 class CoreShellCylinderModel{ 83 public: 84 // Model parameters 85 Parameter radius; 86 Parameter scale; 87 Parameter thickness; 88 Parameter length; 89 Parameter core_sld; 90 Parameter shell_sld; 91 Parameter solvent_sld; 92 Parameter background; 93 Parameter axis_theta; 94 Parameter axis_phi; 95 96 // Constructor 97 CoreShellCylinderModel(); 98 99 // Operators to get I(Q) 100 double operator()(double q); 101 double operator()(double qx, double qy); 102 double evaluate_rphi(double q, double phi); 103 }; 104 105 class EllipsoidModel{ 106 public: 107 // Model parameters 108 Parameter radius_a; 109 Parameter scale; 110 Parameter radius_b; 111 Parameter contrast; 112 Parameter background; 113 Parameter axis_theta; 114 Parameter axis_phi; 115 116 // Constructor 117 EllipsoidModel(); 118 119 // Operators to get I(Q) 120 double operator()(double q); 121 double operator()(double qx, double qy); 122 double evaluate_rphi(double q, double phi); 123 }; 124 125 class EllipticalCylinderModel{ 126 public: 127 // Model parameters 128 Parameter r_minor; 129 Parameter scale; 130 Parameter r_ratio; 131 Parameter length; 132 Parameter contrast; 133 Parameter background; 134 Parameter cyl_theta; 135 Parameter cyl_phi; 136 Parameter cyl_psi; 137 138 // Constructor 139 EllipticalCylinderModel(); 140 141 // Operators to get I(Q) 142 double operator()(double q); 143 double operator()(double qx, double qy); 144 double evaluate_rphi(double q, double phi); 145 }; 146 47 147 #endif -
sansmodels/src/sans/models/c_models/notes.txt
rfca6936 r0f5bc9f 11 11 parameters and the C++ Parameter class. 12 12 13 13 Length = 400 14 I(Q=0.001) = 450.355 15 I(Q=0.001) = 472.332 16 I(Q=0.001) = 4723.32 17 I(Qx=0.001, Qy=0.001) = 4743.56 18 I(Q=0.00447, Phi=0.7854) = 4733 19 pi=3.14159 20 21 I(Qx=0.01, Qy=0.01) = 2299 22 I(Q=0.0141421) = 2326.75 23 ratio 0.988074 1.01207 24 25 Cyl (python): 450.35506578 26 Disp(pyhton): 472.332213339 27 28 -------------- 29 Hello cylinder 30 450.35506578 31 449.358988524 32 446.344929175 33 34 {'npts': 1, 'type': 'gaussian', 'nsigmas': 2, 'width': 0.0} 35 {'npts': 1, 'type': 'flat', 'width': 0.0} 36 37 q= 0.001 38 New Cyl : 450.35506578 39 New Disp: 472.332213339 40 41 cyl(0.01, 0.01) =96.8691 42 cyl(0.0141421) =232.675 43 {'type': 'array'} 44 cyl(0.01, 0.01) =229.9 45 Hello cylinder 46 47 Old Cyl : 450.35506578 48 Old Disp: 472.332213339 -
sansmodels/src/setup.py
raf03ddd r0f5bc9f 93 93 sources = [ 94 94 srcdir+"/c_models.cpp", 95 srcdir+"/CSphereModel.c", 96 srcdir+"/sphere.c", 95 #srcdir+"/CSphereModel.c", 96 #srcdir+"/sphere.c", 97 "sans/models/c_models/CSphereModel.cpp", 98 "sans/models/c_models/sphere.cpp", 97 99 #srcdir+"/CCylinderModel.c", 98 100 "sans/models/c_models/CCylinderModel.cpp", … … 101 103 "sans/models/c_models/dispersion_visitor.cpp", 102 104 srcdir+"/cylinder.c", 103 srcdir+"/CCoreShellCylinderModel.c", 105 #srcdir+"/CCoreShellCylinderModel.c", 106 "sans/models/c_models/CCoreShellCylinderModel.cpp", 107 "sans/models/c_models/coreshellcylinder.cpp", 104 108 srcdir+"/core_shell_cylinder.c", 105 srcdir+"/CCoreShellModel.c", 106 srcdir+"/core_shell.c", 107 srcdir+"/CEllipsoidModel.c", 109 #srcdir+"/CCoreShellModel.c", 110 #srcdir+"/core_shell.c", 111 "sans/models/c_models/CCoreShellModel.cpp", 112 "sans/models/c_models/coreshellsphere.cpp", 113 #srcdir+"/CEllipsoidModel.c", 114 "sans/models/c_models/CEllipsoidModel.cpp", 115 "sans/models/c_models/ellipsoid.cpp", 108 116 srcdir+"/ellipsoid.c", 109 srcdir+"/CEllipticalCylinderModel.c", 117 #srcdir+"/CEllipticalCylinderModel.c", 118 "sans/models/c_models/CEllipticalCylinderModel.cpp", 119 "sans/models/c_models/ellipticalcylinder.cpp", 110 120 srcdir+"/elliptical_cylinder.c", 111 121 srcdir+"/disperser.c",
Note: See TracChangeset
for help on using the changeset viewer.