Changeset 101065a in sasview for sansmodels


Ignore:
Timestamp:
Jan 6, 2012 11:38:28 AM (13 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:
cd127d2
Parents:
2b878d74
Message:

keep only header files in c_extensions and rename it 'include'

Location:
sansmodels
Files:
5 added
7 deleted
7 edited
50 moved

Legend:

Unmodified
Added
Removed

  • sansmodels/setup.py

    r0ba3b08 r101065a  
    4848 
    4949# Build the module name 
    50 srcdir  = os.path.join("src", "c_extensions") 
     50srcdir  = os.path.join("src", "include") 
    5151igordir = os.path.join("src", "libigor") 
    5252c_model_dir = os.path.join("src", "c_models") 
    … …  
    6161                  c_wrapper_dir=wrapper_dir) 
    6262 
    63 IGNORED_FILES = ["a.exe", 
    64                  "__init__.py" 
    65                  ".svn", 
    66                    "lineparser.py", 
    67                    "run.py", 
    68                    "CGaussian.cpp", 
    69                    "CLogNormal.cpp", 
    70                    "CLorentzian.cpp", 
    71                    "CSchulz.cpp", 
    72                    "WrapperGenerator.py", 
    73                    "wrapping.py" 
    74                    ] 
     63IGNORED_FILES = [".svn"] 
    7564if not os.name=='nt': 
    7665    IGNORED_FILES.extend(["gamma_win.c","winFuncs.c"]) 

  • sansmodels/src/c_models/Hardsphere.cpp

    r0ba3b08 r101065a  
    1818 *   sansmodels/src/libigor 
    1919 * 
    20  *      TODO: refactor so that we pull in the old sansmodels.c_extensions 
    2120 */ 
    2221 

  • sansmodels/src/c_models/c_models.cpp

    r20d91bd r101065a  
    6767        //void addCEllipticalCylinderModel(PyObject *module); 
    6868        void addDisperser(PyObject *module); 
    69         void addCGaussian(PyObject *module); 
    70         void addCLogNormal(PyObject *module); 
    7169} 
    7270void addCLorentzian(PyObject *module); 
    7371void addCSchulz(PyObject *module); 
     72void addCGaussian(PyObject *module); 
     73void addCLogNormal(PyObject *module); 
    7474 
    7575/** 

  • sansmodels/src/c_models/lorentzian.cpp

    r82c11d3 r101065a  
    2727/** 
    2828 * Function to evaluate 1D scattering function 
    29   * @param q: q-value 
     29 * @param q: q-value 
    3030 * @return: function value 
    3131 */ 
    … …  
    3333  double delta2 = pow( (q-center()), 2); 
    3434  return scale() / acos(-1.0) * 0.5*gamma() / 
    35     (delta2 + 0.25*gamma()*gamma()); 
     35      (delta2 + 0.25*gamma()*gamma()); 
    3636} 
    3737 
    … …  
    4848/** 
    4949 * Function to evaluate 2D scattering function 
    50  * @param pars: parameters of the cylinder 
    5150 * @param q: q-value 
    5251 * @param phi: angle phi 

  • sansmodels/src/python_wrapper/WrapperGenerator.py

    r642a025 r101065a  
    487487    if len(sys.argv)>1: 
    488488        print "Will look for file %s" % sys.argv[1] 
    489     #app = WrapperGenerator('../c_extensions/elliptical_cylinder.h') 
    490489        app = WrapperGenerator(sys.argv[1]) 
    491490    else: 

  • sansmodels/src/python_wrapper/lineparser.py

    r67424cd r101065a  
    192192    # Read file 
    193193    name= "sphere.h" 
    194     f = open("..\c_extensions\core_shell.h",'r') 
     194    f = open("..\include\core_shell.h",'r') 
    195195    buf = f.read() 
    196196   

  • sansmodels/src/python_wrapper/wrapping.py

    r642a025 r101065a  
    2121 
    2222if __name__ == '__main__': 
    23     header_dir = os.path.join('..', 'c_extensions') 
     23    header_dir = os.path.join('..', 'include') 
    2424    generate_wrappers(header_dir, output_dir="../sans/models/", c_wrapper_dir='.') 
    2525 
Note: See TracChangeset for help on using the changeset viewer.