Skip to content

Commit 291b2d1

Browse files
committed
Sync with the source at e76e015
1 parent 8298ead commit 291b2d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+21225
-213
lines changed

NSFnugget.html

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
<html>
55
<head>
66
<meta charset="utf-8" />
7-
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
8-
7+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
98
<title>Enabling new science in nanoscale structure characterization of complex materials &#8212; DiffPy documentation</title>
109
<link rel="stylesheet" type="text/css" href="_static/pygments.css" />
1110
<link rel="stylesheet" type="text/css" href="_static/bootstrap-sphinx.css" />
@@ -93,7 +92,7 @@
9392
<div class="row">
9493
<div class="body col-md-12 content" role="main">
9594

96-
<section id="enabling-new-science-in-nanoscale-structure-characterization-of-complex-materials">
95+
<div class="section" id="enabling-new-science-in-nanoscale-structure-characterization-of-complex-materials">
9796
<h1>Enabling new science in nanoscale structure characterization of complex materials<a class="headerlink" href="#enabling-new-science-in-nanoscale-structure-characterization-of-complex-materials" title="Permalink to this headline"></a></h1>
9897
<p><em>C. L. Farrow, P. Juhás, J. W. Liu, D. Bryndin, E. S. Božin, J. Bloch,
9998
and S. J. L. Billinge (Michigan State University)</em></p>
@@ -106,12 +105,10 @@ <h1>Enabling new science in nanoscale structure characterization of complex mate
106105
sub-group of the DANSE project recently released a new software tool that
107106
will have a large impact in nanostructure characterization using x-ray and
108107
neutron diffraction.</p>
109-
<figure class="align-center" id="id3">
108+
<div class="figure align-center" id="id3">
110109
<a class="reference internal image-reference" href="_images/PDFgui_screenshot_707.png"><img alt="_images/PDFgui_screenshot_707.png" src="_images/PDFgui_screenshot_707.png" style="width: 399.5px; height: 294.5px;" /></a>
111-
<figcaption>
112-
<p><span class="caption-text">Screen-shot of PDFgui during a refinement of multiple data-sets</span><a class="headerlink" href="#id3" title="Permalink to this image"></a></p>
113-
</figcaption>
114-
</figure>
110+
<p class="caption"><span class="caption-text">Screen-shot of PDFgui during a refinement of multiple data-sets</span><a class="headerlink" href="#id3" title="Permalink to this image"></a></p>
111+
</div>
115112
<p>The diffraction data are Fourier transformed to obtain the atomic pair distribution
116113
function (PDF) and analyzed by quantitatively fitting nanostructure models to the
117114
data. PDFgui allows rapid setup of individual and multiple
@@ -133,7 +130,7 @@ <h1>Enabling new science in nanoscale structure characterization of complex mate
133130
<a class="reference external" href="doc/pdfgui/Farrow-jpcm-2007.pdf"><img alt="downloadFarrowJpcm07" src="_images/pdficon_small.png" /></a></p>
134131
</dd>
135132
</dl>
136-
</section>
133+
</div>
137134

138135

139136
</div>

acknowledgements.html

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
<html>
55
<head>
66
<meta charset="utf-8" />
7-
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
8-
7+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
98
<title>Acknowledgements &#8212; DiffPy documentation</title>
109
<link rel="stylesheet" type="text/css" href="_static/pygments.css" />
1110
<link rel="stylesheet" type="text/css" href="_static/bootstrap-sphinx.css" />
@@ -93,16 +92,16 @@
9392
<div class="row">
9493
<div class="body col-md-12 content" role="main">
9594

96-
<section id="acknowledgements">
95+
<div class="section" id="acknowledgements">
9796
<h1>Acknowledgements<a class="headerlink" href="#acknowledgements" title="Permalink to this headline"></a></h1>
98-
<section id="developers">
97+
<div class="section" id="developers">
9998
<h2>Developers<a class="headerlink" href="#developers" title="Permalink to this headline"></a></h2>
10099
<p>The active DiffPy development team is Pavol Juhas, Kevin Knox, Xiaohao
101100
Yang, Michael McKerns, Chris Farrow, and Simon J. L. Billinge. Former
102101
members of the project are Emil Bozin, Wenduo Zhou, Peng Tian, Timur
103102
Davis, Jiwu Liu, and Dmitriy Bryndin.</p>
104-
</section>
105-
<section id="funding">
103+
</div>
104+
<div class="section" id="funding">
106105
<h2>Funding<a class="headerlink" href="#funding" title="Permalink to this headline"></a></h2>
107106
<p>The DiffPy project is currently supported by Laboratory Directed
108107
Research and Development (LDRD) Program 12-007 (Complex Modeling) at
@@ -118,14 +117,14 @@ <h2>Funding<a class="headerlink" href="#funding" title="Permalink to this headli
118117
recommendations expressed in this material are those of the author(s)
119118
and do not necessarily reflect the views of the respective funding
120119
bodies.</p>
121-
</section>
122-
<section id="additional-contributions">
120+
</div>
121+
<div class="section" id="additional-contributions">
123122
<h2>Additional Contributions<a class="headerlink" href="#additional-contributions" title="Permalink to this headline"></a></h2>
124123
<p>The DiffPy team would like to thank multiple users for their help and
125124
comments during the development of this release: Dragica Podgorski,
126125
Valentina Felsen, and Kirsten M. Ø. Jensen.</p>
127-
</section>
128-
</section>
126+
</div>
127+
</div>
129128

130129

131130
</div>

community.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
<html>
55
<head>
66
<meta charset="utf-8" />
7-
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
8-
7+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
98
<title>Community &#8212; DiffPy documentation</title>
109
<link rel="stylesheet" type="text/css" href="_static/pygments.css" />
1110
<link rel="stylesheet" type="text/css" href="_static/bootstrap-sphinx.css" />
@@ -93,7 +92,7 @@
9392
<div class="row">
9493
<div class="body col-md-12 content" role="main">
9594

96-
<section id="community">
95+
<div class="section" id="community">
9796
<h1>Community<a class="headerlink" href="#community" title="Permalink to this headline"></a></h1>
9897
<p>To ensure a bright future for the DiffPy project it is essential to build a strong community
9998
of users and contributing developers. There are several Google groups for support and
@@ -122,7 +121,7 @@ <h1>Community<a class="headerlink" href="#community" title="Permalink to this he
122121
<a class="reference external" href="mailto:sb2896&#37;&#52;&#48;columbia&#46;edu">Simon J<span>&#46;</span> L<span>&#46;</span> Billinge</a>.</p>
123122
<p>To report or browse bugs, please visit <a class="reference external" href="https://github.com/diffpy">https://github.com/diffpy</a>
124123
and continue to the relevant project and its Issues.</p>
125-
</section>
124+
</div>
126125

127126

128127
</div>
591 KB
Binary file not shown.
69.8 KB
Loading
69.7 KB
Loading
85.9 KB
Loading
77.6 KB
Loading
80.5 KB
Binary file not shown.
Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
Files used in PDF extraction
2+
========================================================================
3+
4+
.. include:: abbreviations.txt
5+
.. _my-configfile:
6+
.. program:: pdfgetx3
7+
8+
Configuration file
9+
------------------------------------------------------------------------
10+
11+
Configuration files may define the PDF processing parameters.
12+
By default, the :program:`pdfgetx3` program attempts to read
13+
:file:`.pdfgetx3.cfg` file from the user HOME directory,
14+
then :file:`.pdfgetx3.cfg` and :file:`pdfgetx3.cfg` files
15+
from the current working directory.
16+
If configuration file has a different name, it needs to be specified
17+
with the :option:`-c, --config <-c>` option.
18+
The :program:`pdfgetn3` program works in the same way,
19+
except it checks for configuration files
20+
:file:`~/.pdfgetn3.cfg`, :file:`.pdfgetn3.cfg` and :file:`pdfgetn3.cfg`.
21+
22+
The easiest way of creating a configuration file is to generate
23+
a template content using the :option:`--createconfig` option as ::
24+
25+
pdfgetx3 --createconfig=test.cfg
26+
27+
and then change the generated test.cfg file in your favorite text
28+
editor. The configuration file follows a simple "varname=value" syntax,
29+
any lines starting with "#" are ignored as comments.
30+
31+
The configuration file has several sections marked as ``[SECTIONNAME]``.
32+
The ``[DEFAULT]`` section is mandatory and it contains the default
33+
global settings. Any other sections are optional and they are applied
34+
only when selected with the :option:`-s, --section <-s>` option on the
35+
command line. Thus ::
36+
37+
pdfgetx3 --config=test.cfg --section=nacl
38+
39+
would read the parameters from the ``[nacl]`` section after reading the
40+
defaults. Having several sections in the configuration
41+
file is useful when there are multiple measurements that share most of
42+
the parameters, but differ in a few of them, for example in chemical
43+
composition. The configuration file can then contain sections per each
44+
sample that define only the composition, while all other parameters are
45+
specified just once in the global DEFAULT section.
46+
47+
48+
Input files
49+
------------------------------------------------------------------------
50+
51+
PDFgetX3 and PDFgetN3 accept input powder diffraction data
52+
in the form of two-column text file,
53+
where the first column x is either the scattering angle
54+
|twotheta| in degrees, momentum transfer *Q* in inverse nanometers or *Q*
55+
in inverse ångströms. The second column y contains the corresponding
56+
scattered intensities normalized per unit solid angle. The actual type
57+
of the x-values is identified by the :confval:`dataformat` parameter.
58+
The input files may contain header with comments or metadata, and the
59+
actual data are read from the first long section of numerical values.
60+
61+
The input files are usually passed as command-line arguments to
62+
:program:`pdfgetx3` or :program:`pdfgetn3` programs and must be paths
63+
accessible from the current working directory.
64+
65+
Input files can be also defined by setting the :confval:`inputfile`
66+
value in the configuration file. The :option:`-d, --datapath <-d>`
67+
option can be then used to provide additional data directories to
68+
search for these inputs and for the :confval:`backgroundfile`.
69+
This is to support configuration files located in a different
70+
directory than the data.
71+
72+
When the :option:`--find <-f>` option is active, the pdfgetx3 arguments
73+
are understood as filename patterns and the input files are found
74+
in the current or specified directory.
75+
76+
77+
Output files
78+
------------------------------------------------------------------------
79+
80+
PDFgetX3 and PDFgetN3 can produce up to four different output data files:
81+
82+
* .iq -- |IQ|, the background-corrected
83+
intensities sampled on a regular *Q*-space grid in inverse ångströms,
84+
85+
* .sq -- |SQ|, the total scattering structure function,
86+
with intensities normalized by average scattering factors and
87+
corrected by a polynomial fit,
88+
89+
* .fq -- |FQ|, the reduced structure function equal to *Q*\ (|SQ| - 1),
90+
91+
* .gr -- |Gr|, the resultant PDF, where the first column is the
92+
separation *r* in ångströms and the second is the function *G* in
93+
Å\ :sup:`-2`.
94+
95+
You can specify what output files should be produced by setting the
96+
:confval:`outputtypes` parameter in the configuration file or by
97+
passing the :option:`-t, --outputtypes <-t>` on the command line.
98+
99+
The header of all output files contains the parameter values that were
100+
used in the calculation and thus it is by itself a valid configuration
101+
file. When passed as an argument to the :option:`--config <-c>` option,
102+
the PDFgetX3 will reproduce the previous calculation.

0 commit comments

Comments
 (0)