Changeset 96c9cf1 in sasview for src/sas/sascalc

Timestamp:

Nov 2, 2017 9:04:32 AM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

08b9e331, 90961b4

Parents:

8e5c36d (diff), 20fa5fe (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:

Paul Kienzle <pkienzle@…> (11/02/17 09:04:32)

git-committer:

GitHub <noreply@…> (11/02/17 09:04:32)

Message:

Merge pull request #121 from llimeht/tmp/spelling

Fix typo in P(r) peaks description

Location:

src/sas/sascalc

Files:

• calculator/instrument.py (modified) (1 diff)
• dataloader/file_reader_base_class.py (modified) (2 diffs)
• file_converter/otoko_loader.py (modified) (1 diff)
• fit/AbstractFitEngine.py (modified) (1 diff)
• pr/c_extensions/Cinvertor.c (modified) (1 diff)
• pr/fit/AbstractFitEngine.py (modified) (1 diff)

src/sas/sascalc/calculator/instrument.py

@@ -314 +314 @@
         """
         To plot the wavelength spactrum
-        : requirment: matplotlib.pyplot
+        : requirement: matplotlib.pyplot
         """
         try:

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -123 +123 @@
         """
         Generic error handler to add an error to the current datainfo to
-        propogate the error up the error chain.
+        propagate the error up the error chain.
         :param msg: Error message
         """
@@ -325 +325 @@
     def splitline(line):
         """
-        Splits a line into pieces based on common delimeters
+        Splits a line into pieces based on common delimiters
         :param line: A single line of text
         :return: list of values

src/sas/sascalc/file_converter/otoko_loader.py

@@ -36 +36 @@
 
         Given the paths of two header files, this function will load each axis in
-        turn.  If loading is successfull then an instance of the OTOKOData class
+        turn.  If loading is successful then an instance of the OTOKOData class
         will be returned, else an exception will be raised.
 

src/sas/sascalc/fit/AbstractFitEngine.py

@@ -78 +78 @@
     def get_params(self, fitparams):
         """
-        return a list of value of paramter to fit
-
-        :param fitparams: list of paramaters name to fit
+        return a list of value of parameter to fit
+
+        :param fitparams: list of parameters name to fit
 
         """

src/sas/sascalc/pr/c_extensions/Cinvertor.c

@@ -735 +735 @@
 
 const char get_peaks_doc[] =
-        "Returns the number of peaks in the output P(r) distrubution\n"
+        "Returns the number of peaks in the output P(r) distribution\n"
         "for the given set of coefficients.\n"
         " @param args: c-parameters\n"

src/sas/sascalc/pr/fit/AbstractFitEngine.py

@@ -78 +78 @@
     def get_params(self, fitparams):
         """
-        return a list of value of paramter to fit
-
-        :param fitparams: list of paramaters name to fit
+        return a list of value of parameter to fit
+
+        :param fitparams: list of parameters name to fit
 
         """