Changeset 0a4628d in sasmodels

Timestamp:

Feb 9, 2016 10:47:07 AM (9 years ago)

Author:

wojciech

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:

a36c6d3

Parents:

43cb3b8

Message:

Scale and background paramters frozen in line model

Files:

• doc/rst_prolog (modified) (1 diff)
• multi_compare.sh (modified) (1 diff)
• sasmodels/convert.py (modified) (1 diff)
• sasmodels/generate.py (modified) (1 diff)
• sasmodels/models/line.py (modified) (4 diffs)

doc/rst_prolog

@@ -60 +60 @@
 .. |g/cm^3| replace:: g\ |cdot|\ cm\ :sup:`-3`
 .. |fm^2| replace:: fm\ :sup:`2`
+.. |Ang*cm^-1| replace:: |Ang|\ |cdot|\ cm\ :sup:`-1`

multi_compare.sh

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 
 sasview=( ../sasview/build/lib.* )

sasmodels/convert.py

@@ -151 +151 @@
         pars['string_thickness_pd_n'] = 0
         pars['number_of_pearls_pd_n'] = 0
+    elif name == 'line':
+        pars['scale'] = 1
+        pars['background'] = 0
     elif name == 'rpa':
         pars['case_num'] = int(pars['case_num'])

sasmodels/generate.py

@@ -233 +233 @@
     "degrees": "degree",
     "1/cm": "|cm^-1|",
+    "Ang/cm": "|Ang*cm^-1|",
     "": "None",
     }

sasmodels/models/line.py

@@ -19 +19 @@
 """
 from numpy import inf
+from numpy import cos
+from numpy import sin
 
 name = "line"
@@ -33 +35 @@
 # pylint: disable=bad-whitespace, line-too-long
 #             ["name", "units", default, [lower, upper], "type", "description"],
-parameters = [["intercept",     "cm^-1",        1.0, [-inf, inf], "", "intercept in linear model"],
-              ["slope",     "Ang*cm^-1",    1.0, [-inf, inf], "", "slope in linear model"],
+parameters = [["intercept",     "1/cm",        1.0, [-inf, inf], "", "intercept in linear model"],
+              ["slope",     "Ang/cm",    1.0, [-inf, inf], "", "slope in linear model"],
               ]
 # pylint: enable=bad-whitespace, line-too-long
@@ -58 +60 @@
     """
     #TODO: Instrcution tels 2D has different deffinition than oher models
-    #return Iq(sqrt(qx ** 2 + qy ** 2), *args)
-    return  Iq(qx, *args)*Iq(qy, *args)
+    #Iq(qx*cos(qy), *args)*Iq(qy, *args
+    return  Iq(qx*cos(qy), *args)*Iq(qx*sin(qy), *args)
 
 Iqxy.vectorized = True # Iqxy accepts an array of qx, qy values
 
-demo = dict(intercept=1.0, slope=1.0)
+demo = dict(scale=1.0, background=0, intercept=1.0, slope=1.0)
 
 oldname = "LineModel"
-oldpars = dict(intercept='A', slope='B', scale=None, background=None)
+oldpars = dict(intercept='A', slope='B', background=None, scale=None)
 
 tests = [
@@ -80 +82 @@
     [{'intercept':   1.0,
       'slope': 1.0,
-     },0.5, 1.5],
+     }, 0.5, 1.5],
 
     [{'intercept':   1.0,
       'slope': 1.0,
-     }, [0.4,0.5], [1.4,1.5]],
+     }, [0.4, 0.5], [1.4, 1.5]],
 
     [{'intercept':   1.0,
       'slope': 1.0,
-     }, [1.3,1.57], [2.3,2.57]],
+     }, [1.3, 1.57], [2.3, 2.57]],
 ]