Changeset 2764


Ignore:
Timestamp:
Mar 29, 2017 8:28:04 PM (5 years ago)
Author:
toby
Message:

formatting changes for docs; add debug to conf.py

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIlattice.py

    r2560 r2764  
    910910    :param dmin: minimum d-spacing in A
    911911    :param Bravais: lattice type (see GetBraviasNum). Bravais is one of::
     912   
    912913             0 F cubic
    913914             1 I cubic
     
    11891190def LaueUnique2(SGData,refList):
    11901191    ''' Impose Laue symmetry on hkl
     1192   
    11911193    :param SGData: space group data from 'P '+Laue
    11921194    :param HKLF: np.array([[h,k,l,...]]) reflection set to be converted
     
    12031205def LaueUnique(Laue,HKLF):
    12041206    ''' Impose Laue symmetry on hkl
     1207   
    12051208    :param Laue: str Laue symbol
    1206     centrosymmetric Laue groups
     1209      centrosymmetric Laue groups::
     1210       
    12071211     ['-1','2/m','112/m','2/m11','mmm','-42m','-4m2','4/mmm','-3','-31m','-3m1',
    12081212     '6/m','6/mmm','m3','m3m']
    1209      noncentrosymmetric Laue groups
     1213     
     1214      noncentrosymmetric Laue groups::
     1215     
    12101216     ['1','2','211','112','m','m11','11m','222','mm2','m2m','2mm',
    12111217     '4','-4','422','4mm','3','312','321','31m','3m1',
    12121218     '6','-6','622','6mm','-62m','-6m2','23','432','-43m']
     1219     
    12131220    :param HKLF: np.array([[h,k,l,...]]) reflection set to be converted
    12141221   
  • trunk/GSASIImath.py

    r2755 r2764  
    5151    """
    5252    Minimize the sum of squares of a function (:math:`f`) evaluated on a series of
    53     values (y): :math:`\sum_{y=0}^{N_{obs}} f(y,{args})`
    54    
    55     ::
    56    
    57                     Nobs
    58         x = arg min(sum(func(y)**2,axis=0))
    59                     y=0
     53    values (y): :math:`\sum_{y=0}^{N_{obs}} f(y,{args})`   
     54    where :math:`x = arg min(\sum_{y=0}^{N_{obs}} (func(y)**2,axis=0))`
    6055
    6156    :param function func: callable method or function
  • trunk/GSASIIobj.py

    r2727 r2764  
    475475a key of ``Data``, as outlined below.
    476476
    477 .. tabularcolumns:: |l|l|p{4in}|
     477.. tabularcolumns:: |l{1in}|l{1in}|p{4in}|
    478478
    479479======================  ===============  ====================================================
  • trunk/GSASIIplot.py

    r2754 r2764  
    2222import wx.glcanvas
    2323import matplotlib as mpl
    24 import matplotlib.collections as mplC
     24try:  # code not found in readthedocs
     25    import matplotlib.collections as mplC
     26except:
     27    print('matplotlib.collections not present')
    2528import mpl_toolkits.mplot3d.axes3d as mp3d
    2629import GSASIIpath
  • trunk/docs/source/conf.py

    r2037 r2764  
    9999sys.path.insert(1, os.path.abspath(os.path.join('..', '..','exports')))
    100100sys.path.insert(1, os.path.abspath(os.path.join('..', '..','imports')))
    101 
     101print(sys.path)
    102102# -- General configuration -----------------------------------------------------
    103103
Note: See TracChangeset for help on using the changeset viewer.