Ignore:
Timestamp:
Aug 18, 2008 4:19:47 PM (17 years ago)
Author:
Mathieu Doucet <doucetm@…>
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:
a86bbe9
Parents:
fca6936
Message:

Model C extension update

Location:
sansmodels/src/sans/models/c_extensions
Files:
1 added
2 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • sansmodels/src/sans/models/c_extensions/c_models.c

    rae3ce4e raf03ddd  
    11/** c_models 
    22 * 
    3  * Module containing all SANS model extensions  
     3 * Module containing all SANS model extensions 
    44 * 
    55 * @author   M.Doucet / UTK 
    … …  
    1111 */ 
    1212static PyMethodDef module_methods[] = { 
    13     {NULL}  
     13    {NULL} 
    1414}; 
    1515 
    … …  
    1919#endif 
    2020PyMODINIT_FUNC 
    21 initc_models(void)  
     21initc_models(void) 
    2222{ 
    2323    PyObject* m; 
    … …  
    2525    m = Py_InitModule3("c_models", module_methods, 
    2626                       "C extension module for SANS scattering models."); 
    27                         
     27 
    2828        addCCylinderModel(m); 
    2929        addCCoreShellCylinderModel(m); 

  • sansmodels/src/sans/models/c_extensions/cylinder.h

    rae3ce4e raf03ddd  
    22#define cylinder_h 
    33 
    4 /** Structure definition for cylinder parameters  
     4/** Structure definition for cylinder parameters 
    55 * [PYTHONCLASS] = CylinderModel 
     6 * [DISP_PARAMS] = radius, length, cyl_theta, cyl_phi 
    67 * */ 
    78typedef struct { 
    8     /// Scale factor  
     9    /// Scale factor 
    910    //  [DEFAULT]=scale=1.0 
    1011    double scale; 
    1112    /// Radius of the cylinder [A] 
    12     //  [DEFAULT]=radius=20.0 A  
     13    //  [DEFAULT]=radius=20.0 A 
    1314    double radius; 
    1415    /// Length of the cylinder [A] 
    … …  
    2021        /// Incoherent Background (cm-1) 0.000 
    2122        //  [DEFAULT]=background=0 cm-1 
    22         double background;     
     23        double background; 
    2324    /// Orientation of the cylinder axis w/respect incoming beam [rad] 
    2425    //  [DEFAULT]=cyl_theta=1.0 rad 
    … …  
    2627    /// Orientation of the cylinder in the plane of the detector [rad] 
    2728    //  [DEFAULT]=cyl_phi=1.0 rad 
    28     double cyl_phi;     
     29    double cyl_phi; 
    2930} CylinderParameters; 
    3031 
Note: See TracChangeset for help on using the changeset viewer.