Changeset f1ecfa92 in sasmodels for sasmodels/generate.py

Timestamp:

Feb 20, 2015 9:38:00 AM (9 years ago)

Author:

ajj

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

6ea6902

Parents:

4c8f9cd

Message:

towards fixing the 'models with no polydispersity' problem

File:

• sasmodels/generate.py (modified) (3 diffs)

sasmodels/generate.py

@@ -549 +549 @@
         weights = [p+"_w" for p in pd_pars]
         sasview_spherical = ""
+    weight_product = "*".join(weights) if len(weights) > 1 else "1.0"
     subst = {
-        'weight_product': "*".join(weights),
+        'weight_product': weight_product,
         'volume_norm': volume_norm,
         'fn': fn,
@@ -574 +575 @@
 
     # Finally, put the pieces together in the kernel.
+    pd_length = "+".join('N'+p for p in pd_pars) if len(pd_pars) > 0 else "0"
     subst = {
         # kernel name is, e.g., cylinder_Iq
@@ -582 +584 @@
         'par_decl': par_decl,
         # to copy global to local pd pars we need, e.g., Nradius+Nlength
-        'pd_length': "+".join('N'+p for p in pd_pars),
+        'pd_length': pd_length,
         # the q initializers, e.g., double qi = q[i];
         'qinit': q_pars['qinit'],