Changeset fd5ac0d in sasview for src/sas/models/c_extension


Ignore:
Timestamp:
Feb 13, 2015 5:26:52 AM (9 years ago)
Author:
krzywon
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:
7a04dbb
Parents:
b9a5f0e
Message:

I have completed the removal of all SANS references.
I will build, run, and run all unit tests before pushing.

Location:
src/sas/models/c_extension
Files:
10 edited
1 moved

Legend:

Unmodified
Added
Removed

  • src/sas/models/c_extension/Doxyfile

    r79492222 rfd5ac0d  
    44# Project related configuration options 
    55#--------------------------------------------------------------------------- 
    6 PROJECT_NAME           = sansmodeling 
     6PROJECT_NAME           = sasmodeling 
    77PROJECT_NUMBER         =  
    88OUTPUT_DIRECTORY       = ../doc 
    … …  
    114114EXCLUDE                = build \ 
    115115                         dist \ 
    116                          sans/models/test \ 
     116                         sas/models/test \ 
    117117                         libigor \ 
    118118                         igor_wrapper \ 
    119                          sans/models/prototypes 
     119                         sas/models/prototypes 
    120120EXCLUDE_SYMLINKS       = NO 
    121121EXCLUDE_PATTERNS       =  

  • src/sas/models/c_extension/c_models/c_models.cpp.template

    r79492222 rfd5ac0d  
    11/** c_models 
    22 * 
    3  * Module containing all SANS model extensions 
     3 * Module containing all SAS model extensions 
    44 * 
    55 * @author   M.Doucet / UTK 
    … …  
    77#include <Python.h> 
    88#include <parameters.hh> 
    9 #define PY_ARRAY_UNIQUE_SYMBOL PyArray_API_sans 
     9#define PY_ARRAY_UNIQUE_SYMBOL PyArray_API_sas 
    1010#include "arrayobject.h" 
    1111 
    … …  
    191191 
    192192  m = Py_InitModule3("c_models", module_methods, 
    193       "C extension module for SANS scattering models."); 
     193      "C extension module for SAS scattering models."); 
    194194  import_array(); 
    195195 

  • src/sas/models/c_extension/libigor/GaussWeights.c

    r79492222 rfd5ac0d  
    11/* 
    22 *  GaussWeights.c 
    3  *  SANSAnalysis 
     3 *  SASAnalysis 
    44 * 
    55 *  Created by Andrew Jackson on 4/23/07. 

  • src/sas/models/c_extension/libigor/GaussWeights.h

    r79492222 rfd5ac0d  
    33/* 
    44 *  GaussWeights.h 
    5  *  SANSAnalysis 
     5 *  SASAnalysis 
    66 * 
    77 *  Created by Andrew Jackson on 4/23/07. 

  • src/sas/models/c_extension/libigor/StandardHeaders.h

    r79492222 rfd5ac0d  
    11/* 
    22 *  StandardHeaders.h 
    3  *  SANSAnalysis 
     3 *  SASAnalysis 
    44 * 
    55 *  Created by Andrew Jackson on 4/23/07. 

  • src/sas/models/c_extension/libigor/libSASAnalysis.h

    r79492222 rfd5ac0d  
    11/* 
    2  *  libSANSAnalysis.h 
    3  *  SANSAnalysis 
     2 *  libSASAnalysis.h 
     3 *  SASAnalysis 
    44 * 
    55 *  Created by Andrew Jackson on 4/24/07. 

  • src/sas/models/c_extension/python_wrapper/WrapperGenerator.py

    r79492222 rfd5ac0d  
    1919         
    2020        where my_model must be replaced by the name of the 
    21         class that you want to import from sans.models. 
     21        class that you want to import from sas.models. 
    2222        (example: [PYTHONCLASS] = MyModel 
    23           will create a class MyModel in sans.models.MyModel. 
     23          will create a class MyModel in sas.models.MyModel. 
    2424          It will also create a class CMyModel in  
    25           sans_extension.c_models.) 
     25          sas_extension.c_models.) 
    2626           
    2727        Also in comments, each parameter of the params  

  • src/sas/models/c_extension/python_wrapper/classTemplate.txt

    r79492222 rfd5ac0d  
    2323 */ 
    2424#define NO_IMPORT_ARRAY 
    25 #define PY_ARRAY_UNIQUE_SYMBOL PyArray_API_sans 
     25#define PY_ARRAY_UNIQUE_SYMBOL PyArray_API_sas 
    2626  
    2727extern "C" { 

  • src/sas/models/c_extension/python_wrapper/modelTemplate.txt

    r79492222 rfd5ac0d  
    2424""" 
    2525 
    26 from sans.models.BaseComponent import BaseComponent 
    27 from sans.models.sans_extension.c_models import [CPYTHONCLASS] 
     26from sas.models.BaseComponent import BaseComponent 
     27from sas.models.sas_extension.c_models import [CPYTHONCLASS] 
    2828 
    2929def create_[PYTHONCLASS](): 

  • src/sas/models/c_extension/python_wrapper/wrapping.py

    r79492222 rfd5ac0d  
    2424 
    2525def write_c_models(model_list): 
    26     # simultaneously generates 'sansmodels/installed_models.txt' 
    27     # and 'sansmodels/src/c_models/c_models.cpp' 
     26    # simultaneously generates 'sasmodels/installed_models.txt' 
     27    # and 'sasmodels/src/c_models/c_models.cpp' 
    2828     
    2929 
    30     template_file = open(os.path.join("src", "sans", "models","c_extension","c_models","c_models.cpp.template"),"r") 
    31     write_file = open(os.path.join("src", "sans",  "models","c_extension","c_models","c_models.cpp"),"w") 
     30    template_file = open(os.path.join("src", "sas", "models","c_extension","c_models","c_models.cpp.template"),"r") 
     31    write_file = open(os.path.join("src", "sas",  "models","c_extension","c_models","c_models.cpp"),"w") 
    3232    buf = template_file.read() 
    3333    lines = buf.split('\n') 
    … …  
    6363if __name__ == '__main__': 
    6464    header_dir = os.path.join('..', 'include') 
    65     generate_wrappers(header_dir, output_dir="../sans/models/", c_wrapper_dir='.') 
     65    generate_wrappers(header_dir, output_dir="../sas/models/", c_wrapper_dir='.') 
    6666 
    6767 

  • src/sas/models/c_extension/release_notes.txt

    r79492222 rfd5ac0d  
    22============= 
    33 
    4 SANS Models version 0.4.3 
     4SAS Models version 0.4.3 
    55 
    66Package name: sans.models  
Note: See TracChangeset for help on using the changeset viewer.