Changeset 2764

Timestamp:

Mar 29, 2017 8:28:04 PM (6 years ago)

Author:

toby

Message:

formatting changes for docs; add debug to conf.py

Location:

trunk

Files:

• GSASIIlattice.py (modified) (3 diffs)
• GSASIImath.py (modified) (1 diff)
• GSASIIobj.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)
• docs/source/conf.py (modified) (1 diff)

trunk/GSASIIlattice.py

@@ -910 +910 @@
     :param dmin: minimum d-spacing in A
     :param Bravais: lattice type (see GetBraviasNum). Bravais is one of::
+    
              0 F cubic
              1 I cubic
@@ -1189 +1190 @@
 def LaueUnique2(SGData,refList):
     ''' Impose Laue symmetry on hkl
+    
     :param SGData: space group data from 'P '+Laue
     :param HKLF: np.array([[h,k,l,...]]) reflection set to be converted
@@ -1203 +1205 @@
 def LaueUnique(Laue,HKLF):
     ''' Impose Laue symmetry on hkl
+    
     :param Laue: str Laue symbol
-    centrosymmetric Laue groups
+      centrosymmetric Laue groups::
+       
      ['-1','2/m','112/m','2/m11','mmm','-42m','-4m2','4/mmm','-3','-31m','-3m1',
      '6/m','6/mmm','m3','m3m']
-     noncentrosymmetric Laue groups
+     
+      noncentrosymmetric Laue groups::
+     
      ['1','2','211','112','m','m11','11m','222','mm2','m2m','2mm',
      '4','-4','422','4mm','3','312','321','31m','3m1',
      '6','-6','622','6mm','-62m','-6m2','23','432','-43m']
+     
     :param HKLF: np.array([[h,k,l,...]]) reflection set to be converted
     

trunk/GSASIImath.py

@@ -51 +51 @@
     """
     Minimize the sum of squares of a function (:math:`f`) evaluated on a series of
-    values (y): :math:`\sum_{y=0}^{N_{obs}} f(y,{args})`
-    
-    ::
-    
-                    Nobs
-        x = arg min(sum(func(y)**2,axis=0))
-                    y=0
+    values (y): :math:`\sum_{y=0}^{N_{obs}} f(y,{args})`    
+    where :math:`x = arg min(\sum_{y=0}^{N_{obs}} (func(y)**2,axis=0))`
 
     :param function func: callable method or function

trunk/GSASIIobj.py

@@ -475 +475 @@
 a key of ``Data``, as outlined below.
 
-.. tabularcolumns:: |l|l|p{4in}|
+.. tabularcolumns:: |l{1in}|l{1in}|p{4in}|
 
 ======================  ===============  ====================================================

trunk/GSASIIplot.py

@@ -22 +22 @@
 import wx.glcanvas
 import matplotlib as mpl
-import matplotlib.collections as mplC
+try:  # code not found in readthedocs
+    import matplotlib.collections as mplC
+except:
+    print('matplotlib.collections not present') 
 import mpl_toolkits.mplot3d.axes3d as mp3d
 import GSASIIpath

trunk/docs/source/conf.py

@@ -99 +99 @@
 sys.path.insert(1, os.path.abspath(os.path.join('..', '..','exports')))
 sys.path.insert(1, os.path.abspath(os.path.join('..', '..','imports')))
-
+print(sys.path)
 # -- General configuration -----------------------------------------------------