Skip to content

Commit e1a5e58

Browse files
LICENSE (#45)
* add two LICENSE.rst files into cookiecutter * fix LICENSE.rst and LICENSE_PDFgui.rst with correct references and year * resolve pdfdataset.py conflict --------- Co-authored-by: Simon Billinge <sbillinge@users.noreply.github.com>
1 parent 9ecf5e8 commit e1a5e58

File tree

4 files changed

+95
-102
lines changed

4 files changed

+95
-102
lines changed

LICENSE.rst

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
BSD 3-Clause License
2+
3+
Copyright 2014-2015, Board of Trustees of Michigan State University
4+
2016-2024, The Trustees of Columbia University in the City of New York.
5+
All rights reserved.
6+
7+
If you use this program to do productive scientific research that
8+
leads to publication, we ask that you acknowledge use of the
9+
program by citing the following paper in your publication:
10+
11+
L. Granlund, S.J.L. Billinge, P.M. Duxbury, Algorithm for
12+
systematic peak extraction from atomic pair distribution
13+
functions, Acta Crystallographica A 71(4), 392-409 (2015).
14+
doi:10.1107/S2053273315005276
15+
16+
For more information please visit the diffpy web-page at
17+
http://www.diffpy.org
18+
or email Luke Granlund at luke.r.granlund@gmail.com, or Prof. Simon
19+
Billinge at sb2896@columbia.edu.
20+
21+
Redistribution and use in source and binary forms, with or without
22+
modification, are permitted provided that the following conditions are met:
23+
24+
1. Redistributions of source code must retain the above copyright notice, this
25+
list of conditions and the following disclaimer.
26+
27+
2. Redistributions in binary form must reproduce the above copyright notice,
28+
this list of conditions and the following disclaimer in the documentation
29+
and/or other materials provided with the distribution.
30+
31+
3. Neither the name of the copyright holder nor the names of its contributors
32+
may be used to endorse or promote products derived from this software
33+
without specific prior written permission.
34+
35+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
36+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
37+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
38+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
39+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
40+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
41+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
42+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
43+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
44+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSE.txt

Lines changed: 0 additions & 46 deletions
This file was deleted.

LICENSE_PDFgui.rst

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
BSD 3-Clause License
2+
3+
Copyright 2006-2007, Board of Trustees of Michigan State University
4+
2008-2024, The Trustees of Columbia University in the City of New York.
5+
All rights reserved.
6+
7+
SrMise incorporates source code from diffpy.pdfgui in the file
8+
pdfdataset.py. The PDFgui license is reproduced in full below.
9+
10+
This program is part of the DiffPy and DANSE open-source projects
11+
and is available subject to the conditions and terms laid out
12+
below.
13+
14+
If you use this program to do productive scientific research that
15+
leads to publication, we ask that you acknowledge use of the
16+
program by citing the following paper in your publication:
17+
18+
C. L. Farrow, P. Juhas, J. W. Liu, D. Bryndin, E. S. Bozin,
19+
J. Bloch, Th. Proffen and S. J. L. Billinge, PDFfit2 and
20+
PDFgui: computer programs for studying nanostructure in
21+
crystals, J. Phys.: Condens. Matter 19, 335219 (2007)
22+
23+
For more information please visit the diffpy web-page at
24+
http://www.diffpy.org
25+
or email Luke Granlund at luke.r.granlund@gmail.com, or Prof. Simon
26+
Billinge at sb2896@columbia.edu.
27+
28+
Redistribution and use in source and binary forms, with or without
29+
modification, are permitted provided that the following conditions are met:
30+
31+
1. Redistributions of source code must retain the above copyright notice, this
32+
list of conditions and the following disclaimer.
33+
34+
2. Redistributions in binary form must reproduce the above copyright notice,
35+
this list of conditions and the following disclaimer in the documentation
36+
and/or other materials provided with the distribution.
37+
38+
3. Neither the name of the copyright holder nor the names of its contributors
39+
may be used to endorse or promote products derived from this software
40+
without specific prior written permission.
41+
42+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
43+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
44+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
45+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
46+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
47+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
48+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
49+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
50+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
51+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSE_PDFgui.txt

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)