Changeset be2775f in sasview for src

Timestamp:

Mar 21, 2016 2:37:11 PM (9 years ago)

Author:

gonzalezm

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

70e5f97

Parents:

d85b0c7 (diff), a8787f9 (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/sasview

Location:

src/sas

Files:

• sascalc/calculator/BaseComponent.py (modified) (2 diffs)
• sasgui/guiframe/data_processor.py (modified) (1 diff)
• sasgui/perspectives/fitting/models.py (modified) (1 diff)

src/sas/sascalc/calculator/BaseComponent.py

@@ -106 +106 @@
 
               qx_prime = [ qx[0], qx[1], qx[2], ....]
+
           and ::
+
               qy_prime = [ qy[0], qy[1], qy[2], ....]
 
         Then get ::
+
             q = numpy.sqrt(qx_prime^2+qy_prime^2)
 
         that is a qr in 1D array; ::
+
             q = [q[0], q[1], q[2], ....]
 
@@ -123 +127 @@
 
             evalDistribution(q)
+
         where q is a numpy array.
 

src/sas/sasgui/guiframe/data_processor.py

@@ -12 +12 @@
 #Path to this is:           /sasview/src/sas/sasgui/guiframe/data_processor.py
 #Path to image is:          /sasview/src/sas/sasgui/guiframe/media/BatchGridClassLayout.png
-.. image::  ./guiframe/media/BatchGridClassLayout.png
-   :align:   center
+
+.. image:: ./guiframe/media/BatchGridClassLayout.png
+   :align: center
 
 """

src/sas/sasgui/perspectives/fitting/models.py

@@ -151 +151 @@
     try:
         import compileall
-        compileall.compile_dir(dir=dir, ddir=dir, force=1,
+        compileall.compile_dir(dir=dir, ddir=dir, force=0,
                                quiet=report_problem)
     except: