Changes in / [850788e:708bc7a] in sasmodels

Location:

sasmodels

Files:

• conversion_table.py (modified) (1 diff)
• convert.py (modified) (1 diff)
• models/guinier_porod.py (modified) (1 diff)
• models/unified_power_Rg.py (added)
• models/unified_power_rg.py (deleted)

sasmodels/conversion_table.py

@@ -854 +854 @@
             "TwoPowerLawModel",
         ],
-        "unified_power_rg": [
+        "unified_power_Rg": [
             "UnifiedPowerRg",
             dict(((field_new+str(index), field_old+str(index))

sasmodels/convert.py

@@ -606 +606 @@
             if pars['volfraction_a'] > 0.5:
                 pars['volfraction_a'] = 1.0 - pars['volfraction_a']
-        elif name == 'unified_power_rg':
+        elif name == 'unified_power_Rg':
             pars['level'] = int(pars['level'])
 

sasmodels/models/guinier_porod.py

@@ -5 +5 @@
 such as rods or platelets, and shapes intermediate between spheres
 and rods or between rods and platelets, and overcomes some of the
-deficiencies of the (Beaucage) :ref:`unified_power_rg` model (see Hammouda, 2010).
+deficiencies of the (Beaucage) Unified_Power_Rg model (see Hammouda, 2010).
 
 Definition