Changeset cfd4625 in sasmodels

Timestamp:

Feb 19, 2015 4:30:01 PM (10 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:

3750279

Parents:

8221f1c (diff), fd1c792 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels

Location:

sasmodels

Files:

• convert.py (modified) (1 diff)
• models/broad_peak.py (modified) (1 diff)
• generate.py (modified) (1 diff)

sasmodels/convert.py

@@ -13 +13 @@
         for variant in ("", "_pd", "_pd_n", "_pd_nsigma", "_pd_type"):
             if old+variant in newpars:
-                newpars[new+variant] = pars[old+variant]
+                if new is not None:
+                    newpars[new+variant] = pars[old+variant]
                 del newpars[old+variant]
         # Sasview style parameter names
         for variant in (".width", ".nsigmas", ".type", ".npts"):
             if old+variant in newpars:
-                newpars[new+variant] = pars[old+variant]
+                if new is not None:
+                    newpars[new+variant] = pars[old+variant]
                 del newpars[old+variant]
     return newpars

sasmodels/models/broad_peak.py

@@ -113 +113 @@
 oldpars = dict(porod_scale='scale_p', porod_exp='exponent_p', 
         lorentz_scale='scale_l', lorentz_length='length_l', peak_pos='q_peak', 
-        lorentz_exp='exponent_l')
+        lorentz_exp='exponent_l', scale=None)

sasmodels/generate.py

@@ -503 +503 @@
     fn = q_pars['fn']
 
-    # Build polydispersity loops
-    depth = 4
-    offset = ""
-    loop_head = []
-    loop_end = []
-    for name in pd_pars:
-        subst = { 'name': name, 'offset': offset }
-        loop_head.append(indent(LOOP_OPEN%subst, depth))
-        loop_end.insert(0, (" "*depth) + "}")
-        offset += '+N'+name
-        depth += 2
+    if len(pd_pars) > 0:
+        # Build polydispersity loops
+        depth = 4
+        offset = ""
+        loop_head = []
+        loop_end = []
+        for name in pd_pars:
+            subst = { 'name': name, 'offset': offset }
+            loop_head.append(indent(LOOP_OPEN%subst, depth))
+            loop_end.insert(0, (" "*depth) + "}")
+            offset += '+N'+name
+            depth += 2
 
     # The volume parameters in the inner loop are used to call the volume()