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

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/python_wrapper

Files:

• WrapperGenerator.py (modified) (1 diff)
• classTemplate.txt (modified) (1 diff)
• modelTemplate.txt (modified) (1 diff)
• wrapping.py (modified) (2 diffs)

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

@@ -19 +19 @@
         
         where my_model must be replaced by the name of the
-        class that you want to import from sans.models.
+        class that you want to import from sas.models.
         (example: [PYTHONCLASS] = MyModel
-          will create a class MyModel in sans.models.MyModel.
+          will create a class MyModel in sas.models.MyModel.
           It will also create a class CMyModel in 
-          sans_extension.c_models.)
+          sas_extension.c_models.)
           
         Also in comments, each parameter of the params 

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

@@ -23 +23 @@
  */
 #define NO_IMPORT_ARRAY
-#define PY_ARRAY_UNIQUE_SYMBOL PyArray_API_sans
+#define PY_ARRAY_UNIQUE_SYMBOL PyArray_API_sas
  
 extern "C" {

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

@@ -24 +24 @@
 """
 
-from sans.models.BaseComponent import BaseComponent
-from sans.models.sans_extension.c_models import [CPYTHONCLASS]
+from sas.models.BaseComponent import BaseComponent
+from sas.models.sas_extension.c_models import [CPYTHONCLASS]
 
 def create_[PYTHONCLASS]():

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

@@ -24 +24 @@
 
 def write_c_models(model_list):
-    # simultaneously generates 'sansmodels/installed_models.txt'
-    # and 'sansmodels/src/c_models/c_models.cpp'
+    # simultaneously generates 'sasmodels/installed_models.txt'
+    # and 'sasmodels/src/c_models/c_models.cpp'
     
 
-    template_file = open(os.path.join("src", "sans", "models","c_extension","c_models","c_models.cpp.template"),"r")
-    write_file = open(os.path.join("src", "sans",  "models","c_extension","c_models","c_models.cpp"),"w")
+    template_file = open(os.path.join("src", "sas", "models","c_extension","c_models","c_models.cpp.template"),"r")
+    write_file = open(os.path.join("src", "sas",  "models","c_extension","c_models","c_models.cpp"),"w")
     buf = template_file.read()
     lines = buf.split('\n')
@@ -63 +63 @@
 if __name__ == '__main__':
     header_dir = os.path.join('..', 'include')
-    generate_wrappers(header_dir, output_dir="../sans/models/", c_wrapper_dir='.')
+    generate_wrappers(header_dir, output_dir="../sas/models/", c_wrapper_dir='.')