Changeset 51f14603 in sasview for src/sans/calculator

Timestamp:

Apr 3, 2014 11:37:53 AM (11 years ago)

Author:

Peter Parker

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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

2f2d9d0

Parents:

eea3ffa

Message:

Refs #202 - Fix Sphinx build errors (not including park-1.2.1/). Most warnings remain.

Location:

src/sans/calculator

Files:

• resolution_calculator.py (modified) (1 diff)
• sans_gen.py (modified) (2 diffs)

src/sans/calculator/resolution_calculator.py

@@ -473 +473 @@
         """
         Get the variance when the slit/pinhole size is given
-        : size: list that can be one(diameter for circular)
-                or two components(lengths for rectangular)
+        : size: list that can be one(diameter for circular) or two components(lengths for rectangular)
         : distance: [z, x] where z along the incident beam, x // qx_value
         : comp: direction of the sigma; can be 'phi', 'y', 'x', and 'radial'

src/sans/calculator/sans_gen.py

@@ -197 +197 @@
         """
         Evaluate a distribution of q-values.
-        * For 1D, a numpy array is expected as input:
-            evalDistribution(q)   
-        where q is a numpy array.
-        * For 2D, a list of numpy arrays are expected: [qx_prime,qy_prime],
-          where 1D arrays,  
-        :param qdist: ndarray of scalar q-values or list [qx,qy] 
-                    where qx,qy are 1D ndarrays 
+        * For 1D, a numpy array is expected as input: evalDistribution(q) where q is a numpy array.
+        * For 2D, a list of numpy arrays are expected: [qx_prime,qy_prime], where 1D arrays.
+        :param qdist: ndarray of scalar q-values or list [qx,qy] where qx,qy are 1D ndarrays 
         """
         if qdist.__class__.__name__ == 'list':
@@ -952 +948 @@
     def set_sldms(self, sld_mx, sld_my, sld_mz):
         """
-        Sets (|m|, m_theta, m_phi)
+        Sets (\|m\|, m_theta, m_phi)
         """
         if sld_mx.__class__.__name__ == 'float':