Changeset d76c43a in sasview for src/sas/sascalc

Timestamp:

Sep 20, 2017 4:39:48 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:

fca1f50, 793713d

Parents:

ce0a245 (diff), f80b416e (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@…> (09/20/17 16:39:48)

git-committer:

GitHub <noreply@…> (09/20/17 16:39:48)

Message:

Merge pull request #103 from SasView?/ticket-639-katex

Ticket 639 katex

Location:

src/sas/sascalc

Files:

• calculator/sas_gen.py (modified) (1 diff)
• realspace/__init__.py (modified) (3 diffs)

src/sas/sascalc/calculator/sas_gen.py

@@ -913 +913 @@
     def set_sldms(self, sld_mx, sld_my, sld_mz):
         r"""
-        Sets (\|m\|, m_theta, m_phi)
-        """
+        Sets mx, my, mz and abs(m).
+        """ # Note: escaping
         if sld_mx.__class__.__name__ == 'float':
             self.sld_mx = np.ones(len(self.pos_x)) * sld_mx

src/sas/sascalc/realspace/__init__.py

@@ -1 +1 @@
 """
     Real-Space Modeling for SAS
-""" 
+"""
 ## \mainpage Real-Space Modeling for SAS
 #
 # \section intro_sec Introduction
-# This module provides SAS scattering intensity simulation 
+# This module provides SAS scattering intensity simulation
 # based on real-space modeling.
 #
-# Documentation can be found here: 
+# Documentation can be found here:
 #    http://danse.us/trac/sas/wiki/RealSpaceModeling
 #
@@ -37 +37 @@
 #
 # \section overview_sec Package Overview
-# 
+#
 # \subsection class Class Diagram:
 # \image html real-space-class-diagram.png
 #
 # \subsection behav Behavior Enumeration:
-# \image html enum.gif
+# \image html enum.png
 #
 # \subsection Tutorial
@@ -78 +78 @@
 # \section help_sec Contact Info
 # Code and Documentation by Jing Zhou as part of the DANSE project.
-