-                      rd138d43
+                      r91c5fdc
+import sys
+sys.path.insert(0,'..')
+import sys, os
+sys.path.insert(0, os.path.abspath('..'))
+from sasmodels import generate, core
+# Convert ../sasmodels/models/name.py to sasmodels.models.name
+module_name = sys.argv[1][3:-3].replace('/','.').replace('\\','.')
+#print module_name
+module = __import__(module_name)
+for part in module_name.split('.')[1:]:
+    module = getattr(module, part)
+#print module
+# Convert ../sasmodels/models/name.py to name
+model_name = os.path.basename(sys.argv[1])[:-3]
 # Load the doc string from the module definition file and store it in rst
+from sasmodels import generate
+docstr = generate.doc(module)
+docstr = generate.make_doc(core.load_model_info(model_name))
 open(sys.argv[2],'w').write(docstr)

sasmodels/compare.py

-                      r35b4c47
+                      r91c5fdc
             print(exc)
             print("... trying again with single precision")
+            dtype = 'single'
+            return core.build_model(model_info, dtype=dtype, platform="ocl")
+            return core.build_model(model_info, dtype='single', platform="ocl")
     if model_info['composition']:
         composition_type, parts = model_info['composition']
 …
         print("expected parameters: model N1 N2")
     def load_model(name):
+    def _get_info(name):
         try:
             model_info = core.load_model_info(name)
 …
     name = args[0]
     if '*' in name:
         parts = [load_model(k) for k in name.split('*')]
+        parts = [_get_info(k) for k in name.split('*')]
         model_info = product.make_product_info(*parts)
     else:
         model_info = load_model(name)
+        model_info = _get_info(name)
     invalid = [o[1:] for o in flags

sasmodels/generate.py

-                      rb8e5e21
+                      r91c5fdc
     Iq_units = "The returned value is scaled to units of |cm^-1| |sr^-1|, absolute scale."
     Sq_units = "The returned value is a dimensionless structure factor, $S(q)$."
-    is_Sq = ("structure-factor" in model_info['category'])
-    #docs = kernel_module.__doc__
     docs = convert_section_titles_to_boldface(model_info['docs'])
     subst = dict(id=model_info['id'].replace('_', '-'),
 …
                  title=model_info['title'],
                  parameters=make_partable(model_info['parameters']),
                  returns=Sq_units if is_Sq else Iq_units,
+                 returns=Sq_units if model_info['structure_factor'] else Iq_units,
                  docs=docs)
     return DOC_HEADER % subst

Note: See TracChangeset for help on using the changeset viewer.