Changeset 310ddcb in sasmodels for sasmodels/convert.py

Timestamp:

Mar 16, 2016 3:31:02 PM (8 years ago)

Author:

richardh

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:

3a45c2c

Parents:

cb97bff

Message:

fix convert for new structure_factor flag in model_info

File:

• sasmodels/convert.py (modified) (4 diffs)

sasmodels/convert.py

@@ -4 +4 @@
 import warnings
 
-STRUCTURE_FACTORS = [
-    'hardsphere',
-    'stickyhardsphere',
-    'squarewell',
-    'HayterMSAsq'
-]
 # List of models which SasView versions don't contain the explicit 'scale' argument.
 # When converting such a model, please update this list.
-MODELS_WITHOUT_SCALE = STRUCTURE_FACTORS + [
+MODELS_WITHOUT_SCALE = [
     'teubner_strey',
     'broad_peak',
@@ -27 +21 @@
 # List of models which SasView versions don't contain the explicit 'background' argument.
 # When converting such a model, please update this list.
-MODELS_WITHOUT_BACKGROUND = STRUCTURE_FACTORS + [
+MODELS_WITHOUT_BACKGROUND = [
     'guinier',
 ]
@@ -128 +122 @@
     # Note: update compare.constrain_pars to match
     name = model_info['id']
-    if name in MODELS_WITHOUT_SCALE:
+    if name in MODELS_WITHOUT_SCALE or model_info['structure_factor']:
         if oldpars.pop('scale', 1.0) != 1.0:
             warnings.warn("parameter scale not used in sasview %s"%name)
-    if name in MODELS_WITHOUT_BACKGROUND:
+    if name in MODELS_WITHOUT_BACKGROUND or model_info['structure_factor']:
         if oldpars.pop('background', 0.0) != 0.0:
             warnings.warn("parameter background not used in sasview %s"%name)
@@ -161 +155 @@
     name = model_info['id']
     # Note: update convert.revert_model to match
-    if name in MODELS_WITHOUT_SCALE:
+    if name in MODELS_WITHOUT_SCALE or model_info['structure_factor']:
         pars['scale'] = 1
-    if name in MODELS_WITHOUT_BACKGROUND:
+    if name in MODELS_WITHOUT_BACKGROUND or model_info['structure_factor']:
         pars['background'] = 0
     # sasview multiplies background by structure factor