Changeset 082c565 in sasview for setup.py

Timestamp:

Jul 27, 2012 5:02:39 AM (12 years ago)

Author:

Kieran Campbell <kieranrcampbell@…>

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:

fd1aec6f

Parents:

48c547b

Message:

Added documentation for StarPolymer? model

File:

• setup.py (modified) (5 diffs)

setup.py

@@ -217 +217 @@
 smear_dir  = os.path.join("sansmodels", "src", "c_smearer")
 wrapper_dir  = os.path.join("sansmodels", "src", "python_wrapper", "generated")
+model_dir = os.path.join("sansmodels", "src", "sans","models")
+
 if os.path.isdir(wrapper_dir):
     for file in os.listdir(wrapper_dir): 
@@ -225 +227 @@
 sys.path.append(os.path.join("sansmodels", "src", "python_wrapper"))
 from wrapping import generate_wrappers
-generate_wrappers(header_dir=includedir, 
-                  output_dir=os.path.join("sansmodels", "src", "sans", "models"), 
-                  c_wrapper_dir=wrapper_dir)
+generate_wrappers(header_dir = includedir, 
+                  output_dir = model_dir,
+                  c_wrapper_dir = wrapper_dir)
 
 IGNORED_FILES = [".svn"]
@@ -265 +267 @@
 
 package_dir["sans"] = os.path.join("sansmodels", "src", "sans")
-package_dir["sans.models"] = os.path.join("sansmodels", "src", "sans", "models")
+package_dir["sans.models"] = model_dir
+
 package_dir["sans.models.sans_extension"] = os.path.join("sansmodels", "src", "sans", "models", "sans_extension")
             
@@ -273 +276 @@
 smearer_sources = [os.path.join(smear_dir, "smearer.cpp"),
                   os.path.join(smear_dir, "smearer_module.cpp")]
+
+# compile list of installed models
+installed_model_file = open(os.path.join("sansmodels",
+                                         "installed_models.txt"),'w')
+not_models = ['BaseComponent',
+              'sans_extension',
+              'MulComponent',
+              'svn',
+              'media',
+              'SubComponent',
+              '__init__',
+              'dispersion_models',
+              'AddComponent',
+              'qsmearing']
+
+for model in os.listdir(model_dir):
+    if not model.rstrip(".py") in not_models:
+        installed_model_file.write(model.rstrip(".py") + '\n')
+
+installed_model_file.close()
 
 if os.name=='nt':
@@ -312 +335 @@
 else:
     required.extend(['pil'])
+
+
+
    
  # Set up SansView