Changes in / [16bb433:6abd46f] in sasmodels

Files:

• .gitignore (modified) (2 diffs)
• doc/rst_prolog (modified) (1 diff)
• multi_compare.sh (modified) (1 diff)
• sasmodels/convert.py (modified) (2 diffs)
• sasmodels/generate.py (modified) (1 diff)
• sasmodels/models/img/two_power_law_1d.jpg (added)
• sasmodels/models/line.py (added)
• sasmodels/models/two_power_law.py (added)
• setup.py (modified) (1 diff)

.gitignore

@@ -1 +1 @@
 /build/
 /dist/
+/logs/
 /*.csv
 *.pyc
@@ -16 +17 @@
 /.project
 /.pydevproject
+/.idea
+/sasmodels.egg-info/

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

@@ -10 +10 @@
     'broad_peak',
     'two_lorentzian',
+    "two_power_law",
     'gel_fit',
     'gauss_lorentz_gel',
@@ -151 +152 @@
         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",
     }

setup.py

@@ -11 +11 @@
     version = "1.0.0a",
     description = "sasmodels package",
-    long_description=open('README.rst').read(),
+    long_description=open('README.md').read(),
     author = "SasView Collaboration",
     author_email = "management@sasview.org",