Changeset 5582b078 in sasview for src/sas/sascalc

Timestamp:

Oct 21, 2017 3:00:12 PM (7 years ago)

Author:

GitHub <noreply@…>

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

Children:

c926a97, b6b81a3, 3d950a9, 61f329f0, fca1f50

Parents:

5543ff6 (diff), c22b621 (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.

git-author:

Andrew Jackson <andrew.jackson@…> (10/21/17 15:00:12)

git-committer:

GitHub <noreply@…> (10/21/17 15:00:12)

Message:

Merge pull request #110 from SasView?/ticket-947-sasmodels-docs

close ticket 947 sasmodels docs

Location:

src/sas/sascalc

Files:

• corfunc/corfunc_calculator.py (modified) (1 diff)
• data_util/registry.py (modified) (1 diff)
• file_converter/c_ext/__init__.py (modified) (1 diff)

src/sas/sascalc/corfunc/corfunc_calculator.py

@@ -177 +177 @@
         """
         Extract the interesting measurements from a correlation function
-        :param transformed_data: Fourier transformation of the
-            extrapolated data
+
+        :param transformed_data: Fourier transformation of the extrapolated data
         """
         # Calculate indexes of maxima and minima

src/sas/sascalc/data_util/registry.py

@@ -121 +121 @@
         Call the loader for the file type of path.
 
-        :raise ValueError: if no loader is available.
-        :raise KeyError: if format is not available.
+        :raises ValueError: if no loader is available.
+        :raises KeyError: if format is not available.
+
         May raise a loader-defined exception if loader fails.
         """

src/sas/sascalc/file_converter/c_ext/__init__.py

@@ +1 @@
+"""
+    Data loader for the Diamond BSL beamline.
+"""