Skip to content

Commit 80f16d6

Browse files
committed
update doc and api doc to 1.0a0
1 parent 9f9a611 commit 80f16d6

File tree

4 files changed

+95
-97
lines changed

4 files changed

+95
-97
lines changed

doc/manual/source/api/diffpy.rst

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
diffpy Package
1+
diffpy package
22
==============
33

4-
:mod:`diffpy` Package
5-
---------------------
6-
74
Subpackages
85
-----------
96

107
.. toctree::
118

129
diffpy.srreal
1310

11+
Module contents
12+
---------------
13+
14+
.. automodule:: diffpy
15+
:members:
16+
:undoc-members:
17+
:show-inheritance:
Lines changed: 48 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,170 +1,166 @@
1-
srreal Package
2-
==============
1+
diffpy.srreal package
2+
=====================
33

4-
:mod:`srreal` Package
5-
---------------------
4+
Submodules
5+
----------
66

7-
.. automodule:: diffpy.srreal
8-
:members:
9-
:undoc-members:
10-
:show-inheritance:
11-
12-
:mod:`atomradiitable` Module
13-
----------------------------
7+
diffpy.srreal.atomradiitable module
8+
-----------------------------------
149

1510
.. automodule:: diffpy.srreal.atomradiitable
1611
:members:
1712
:undoc-members:
1813
:show-inheritance:
1914

20-
:mod:`attributes` Module
21-
------------------------
15+
diffpy.srreal.attributes module
16+
-------------------------------
2217

2318
.. automodule:: diffpy.srreal.attributes
2419
:members:
2520
:undoc-members:
2621
:show-inheritance:
2722

28-
:mod:`bondcalculator` Module
29-
----------------------------
23+
diffpy.srreal.bondcalculator module
24+
-----------------------------------
3025

3126
.. automodule:: diffpy.srreal.bondcalculator
3227
:members:
3328
:undoc-members:
3429
:show-inheritance:
3530

36-
:mod:`bvparameterstable` Module
37-
-------------------------------
31+
diffpy.srreal.bvparameterstable module
32+
--------------------------------------
3833

3934
.. automodule:: diffpy.srreal.bvparameterstable
4035
:members:
4136
:undoc-members:
4237
:show-inheritance:
4338

44-
:mod:`bvscalculator` Module
45-
---------------------------
39+
diffpy.srreal.bvscalculator module
40+
----------------------------------
4641

4742
.. automodule:: diffpy.srreal.bvscalculator
4843
:members:
4944
:undoc-members:
5045
:show-inheritance:
5146

52-
:mod:`eventticker` Module
53-
-------------------------
47+
diffpy.srreal.eventticker module
48+
--------------------------------
5449

5550
.. automodule:: diffpy.srreal.eventticker
5651
:members:
5752
:undoc-members:
5853
:show-inheritance:
5954

60-
:mod:`overlapcalculator` Module
61-
-------------------------------
55+
diffpy.srreal.overlapcalculator module
56+
--------------------------------------
6257

6358
.. automodule:: diffpy.srreal.overlapcalculator
6459
:members:
6560
:undoc-members:
6661
:show-inheritance:
6762

68-
:mod:`pairquantity` Module
69-
--------------------------
63+
diffpy.srreal.pairquantity module
64+
---------------------------------
7065

7166
.. automodule:: diffpy.srreal.pairquantity
7267
:members:
7368
:undoc-members:
7469
:show-inheritance:
7570

76-
:mod:`parallel` Module
77-
----------------------
71+
diffpy.srreal.parallel module
72+
-----------------------------
7873

7974
.. automodule:: diffpy.srreal.parallel
8075
:members:
8176
:undoc-members:
8277
:show-inheritance:
8378

84-
:mod:`pdfbaseline` Module
85-
-------------------------
79+
diffpy.srreal.pdfbaseline module
80+
--------------------------------
8681

8782
.. automodule:: diffpy.srreal.pdfbaseline
8883
:members:
8984
:undoc-members:
9085
:show-inheritance:
9186

92-
:mod:`pdfcalculator` Module
93-
---------------------------
87+
diffpy.srreal.pdfcalculator module
88+
----------------------------------
9489

9590
.. automodule:: diffpy.srreal.pdfcalculator
9691
:members:
9792
:undoc-members:
9893
:show-inheritance:
9994

100-
:mod:`pdfenvelope` Module
101-
-------------------------
95+
diffpy.srreal.pdfenvelope module
96+
--------------------------------
10297

10398
.. automodule:: diffpy.srreal.pdfenvelope
10499
:members:
105100
:undoc-members:
106101
:show-inheritance:
107102

108-
:mod:`peakprofile` Module
109-
-------------------------
103+
diffpy.srreal.peakprofile module
104+
--------------------------------
110105

111106
.. automodule:: diffpy.srreal.peakprofile
112107
:members:
113108
:undoc-members:
114109
:show-inheritance:
115110

116-
:mod:`peakwidthmodel` Module
117-
----------------------------
111+
diffpy.srreal.peakwidthmodel module
112+
-----------------------------------
118113

119114
.. automodule:: diffpy.srreal.peakwidthmodel
120115
:members:
121116
:undoc-members:
122117
:show-inheritance:
123118

124-
:mod:`scatteringfactortable` Module
125-
-----------------------------------
119+
diffpy.srreal.scatteringfactortable module
120+
------------------------------------------
126121

127122
.. automodule:: diffpy.srreal.scatteringfactortable
128123
:members:
129124
:undoc-members:
130125
:show-inheritance:
131126

132-
:mod:`structureadapter` Module
133-
------------------------------
127+
diffpy.srreal.structureadapter module
128+
-------------------------------------
134129

135130
.. automodule:: diffpy.srreal.structureadapter
136131
:members:
137132
:undoc-members:
138133
:show-inheritance:
139134

140-
:mod:`structureconverters` Module
141-
---------------------------------
135+
diffpy.srreal.structureconverters module
136+
----------------------------------------
142137

143138
.. automodule:: diffpy.srreal.structureconverters
144139
:members:
145140
:undoc-members:
146141
:show-inheritance:
147142

148-
:mod:`version` Module
149-
---------------------
143+
diffpy.srreal.version module
144+
----------------------------
150145

151146
.. automodule:: diffpy.srreal.version
152147
:members:
153148
:undoc-members:
154149
:show-inheritance:
155150

156-
:mod:`wraputils` Module
157-
-----------------------
151+
diffpy.srreal.wraputils module
152+
------------------------------
158153

159154
.. automodule:: diffpy.srreal.wraputils
160155
:members:
161156
:undoc-members:
162157
:show-inheritance:
163158

164-
Subpackages
165-
-----------
166-
167-
.. toctree::
168159

169-
diffpy.srreal.tests
160+
Module contents
161+
---------------
170162

163+
.. automodule:: diffpy.srreal
164+
:members:
165+
:undoc-members:
166+
:show-inheritance:

doc/manual/source/index.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Last updated |today|.
1313

1414
diffpy.srreal - calculators for PDF, bond valence sum and other pair quantities
1515

16+
1617
The diffpy.srreal package provides calculators for atomic pair distribution
1718
function (PDF), bond valence sums (BVS), atom overlaps for a hard-sphere
1819
model, bond distances and directions up to specified maximum distance. The
@@ -31,7 +32,7 @@ be done in two modes - either as a real-space summation of peak profiles
3132
transform of the total scattering structure function (DebyePDFCalculator).
3233

3334
The diffpy.srreal package is a Python binding to the C++ library libdiffpy
34-
(https://github.com/diffpy/libdiffpy/). Calculators are created as
35+
(https://github.com/diffpy/libdiffpy). Calculators are created as
3536
objects of a given calculator type and so multiple instances of the same
3637
calculator type can exist with different configurations. Calculators are
3738
composed of other objects that perform lower-level tasks, such as calculating
@@ -47,7 +48,7 @@ pairs, by defining only the function that processes atom-pair contributions.
4748
Disclaimer
4849
===================
4950

50-
.. include:: ../../../LICENSE.txt
51+
.. literalinclude:: ../../../LICENSE.txt
5152

5253
================
5354
Acknowledgments

doc/manual/source/install.rst

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8,74 +8,72 @@ Requirements
88

99
The diffpy.srreal requires Python 2.6 or 2.7 and the following software:
1010

11-
* `setuptools` - tools for installing Python packages
12-
* `NumPy` - library for scientific computing with Python
13-
* `scons` - software constructions tool (1.0 or later)
14-
* `python-dev` - header files for interfacing Python with C
15-
* `libboost-dev` - Boost C++ libraries development files (1.43 or later)
16-
* `libdiffpy` - C++ library for PDF, bond valence sum and other pair
17-
quantity calculators https://github.com/diffpy/libdiffpy/
18-
* `diffpy.Structure` - simple storage and manipulation of atomic structures
19-
https://github.com/diffpy/diffpy.Structure/
11+
* ``setuptools`` - tools for installing Python packages
12+
* ``NumPy`` - library for scientific computing with Python
13+
* ``scons`` - software constructions tool (1.0 or later)
14+
* ``python-dev`` - header files for interfacing Python with C
15+
* ``libboost-dev`` - Boost C++ libraries development files (1.43 or later)
16+
* ``libdiffpy`` - C++ library for PDF, bond valence sum and other pair
17+
quantity calculators https://github.com/diffpy/libdiffpy
18+
* ``diffpy.Structure`` - simple storage and manipulation of atomic structures
19+
https://github.com/diffpy/diffpy.Structure
2020

2121
Recommended software:
2222

23-
* `periodictable` - periodic table of elements in Python
24-
http://www.reflectometry.org/danse/elements.html
25-
* `pyobjcryst` - Python bindings to ObjCryst++, the Object Oriented
26-
Crystallographic library for C++
27-
https://github.com/diffpy/pyobjcryst/
23+
* ``periodictable`` - periodic table of elements in Python
24+
http://www.reflectometry.org/danse/elements.html
25+
* ``pyobjcryst`` - Python bindings to ObjCryst++, the Object Oriented
26+
Crystallographic library for C++, https://github.com/diffpy/pyobjcryst.
2827

2928
Some of the required software may be available in the system package manager,
3029
for example, on Ubuntu Linux the dependencies can be installed as::
3130

32-
sudo apt-get install \
33-
python-setuptools python-numpy scons \
34-
build-essential python-dev libboost-dev
31+
sudo apt-get install \
32+
python-setuptools python-numpy scons \
33+
build-essential python-dev libboost-dev
3534

36-
For Mac OS X machine with the MacPorts package manager one could do::
35+
For Mac OS X machine with the MacPorts package manager one could do ::
3736

38-
sudo port install \
39-
python27 py27-setuptools py27-numpy scons boost
37+
sudo port install \
38+
python27 py27-setuptools py27-numpy scons boost
4039

4140
When installing with MacPorts, make sure the MacPorts bin directory is the
42-
first in the system PATH and that python27 is selected as the default::
43-
Python version in MacPorts:
41+
first in the system PATH and that python27 is selected as the default
42+
Python version in MacPorts::
4443

45-
sudo port select --set python python27
44+
sudo port select --set python python27
4645

4746
For other required packages see their respective web pages for installation
4847
instructions.
4948

50-
5149
.. index:: Installation
5250

5351
Installation
5452
------------------------------------------------------------------------
5553

5654
The easiest option is to use the latest DiffPy-CMI release bundle from
57-
http://www.diffpy.org/, which comes with diffpy.srreal and all other
55+
http://www.diffpy.org, which comes with diffpy.srreal and all other
5856
dependencies included.
5957

6058
If you prefer to install from sources, make sure all required software
61-
packages are in place and then run::
59+
packages are in place and then run ::
6260

63-
sudo python setup.py install
61+
sudo python setup.py install
6462

6563
This installs diffpy.srreal for all users in the default system location.
6664
If administrator (root) access is not available, see the usage info from
67-
"python setup.py install --help" for options to install to a user-writable
65+
``python setup.py install --help`` for options to install to a user-writable
6866
location. The installation integrity can be verified by changing to
69-
the HOME directory and running::
67+
the HOME directory and running ::
7068

71-
python -m diffpy.srreal.tests.run
69+
python -m diffpy.srreal.tests.run
7270

73-
An alternative way of installing diffpy.srreal is to use the scons tool,
71+
An alternative way of installing diffpy.srreal is to use the SCons tool,
7472
which can speed up the process by compiling the C++ files in parallel (-j4)::
7573

76-
sudo scons -j4 install
74+
sudo scons -j4 install
7775

78-
See "scons -h" for build parameters and options to install to a user-writable
76+
See ``scons -h`` for build parameters and options to install to a user-writable
7977
directory.
8078

8179

@@ -85,16 +83,15 @@ Development
8583
diffpy.srreal is an open-source software developed as a part of the
8684
DiffPy-CMI complex modeling initiative at the Brookhaven National
8785
Laboratory. The diffpy.srreal sources are hosted at
88-
89-
https://github.com/diffpy/diffpy.srreal
86+
https://github.com/diffpy/diffpy.srreal.
9087

9188
Feel free to fork the project and contribute. To install diffpy.srreal
9289
in a development mode, where the sources are directly used by Python
93-
rather than copied to a system directory, use::
90+
rather than copied to a system directory, use ::
9491

95-
python setup.py develop --user
92+
python setup.py develop --user
9693

9794
To rebuild the C++ extension module and then optionally test the code
98-
integrity, use::
95+
integrity, use ::
9996

100-
scons -j4 build=debug develop [test]
97+
scons -j4 build=debug develop [test]

0 commit comments

Comments
 (0)