Update licence notices in line with recommendations from TT

29d658bb · Thomas White · 01c4ccd0 · 29d658bb · 29d658bb · 29d658bb
Commit 29d658bb authored Mar 09, 2012 by Thomas White
--- a/README
+++ b/README
 CrystFEL - Crystallography with a FEL
 -------------------------------------

-Copyright © 2012 Thomas White <taw@physics.org>
-Copyright © 2012 Richard Kirian <rkirian@asu.edu>
-Copyright © 2012 Andrew Aquila <andrew.aquila@cfel.de>
-Copyright © 2012 Andrew Martin <andrew.martin@desy.de>
-Copyright © 2012 Lorenzo Galli <lorenzo.galli@desy.de>
+Copyright © 2012 Deutsches Elektronen-Synchrotron DESY,
+                 a research centre of the Helmholtz Association.
+
+Authors:
+  Thomas White <taw@physics.org>
+  Richard Kirian <rkirian@asu.edu>
+  Andrew Aquila <andrew.aquila@cfel.de>
+  Andrew Martin <andrew.martin@desy.de>
+  Lorenzo Galli <lorenzo.galli@desy.de>

 Please read the AUTHORS file for a full list of contributions and contributors.
 See the COPYING file for licence conditions.  Summary: GPLv3+.

--- a/doc/man/check_hkl.1
+++ b/doc/man/check_hkl.1
@@ -59,9 +59,9 @@ This page was written by Thomas White.
 Report bugs to <taw@physics.org>, or visit <http://www.desy.de/~twhite/crystfel>.

 .SH COPYRIGHT AND DISCLAIMER
-Copyright © 2012 Thomas White <taw@physics.org>
+Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, a research centre of the Helmholtz Association.
 .P
-check_hkl is part of CrystFEL.
+check_hkl, and this manual, are part of CrystFEL.
 .P
 CrystFEL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 .P

--- a/doc/man/compare_hkl.1
+++ b/doc/man/compare_hkl.1
@@ -78,9 +78,9 @@ This page was written by Thomas White.
 Report bugs to <taw@physics.org>, or visit <http://www.desy.de/~twhite/crystfel>.

 .SH COPYRIGHT AND DISCLAIMER
-Copyright © 2012 Thomas White <taw@physics.org>
+Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, a research centre of the Helmholtz Association.
 .P
-compare_hkl is part of CrystFEL.
+compare_hkl, and this manual, are part of CrystFEL.
 .P
 CrystFEL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 .P

--- a/doc/man/crystfel.7
+++ b/doc/man/crystfel.7
@@ -119,15 +119,7 @@ Report bugs to <taw@physics.org>, or visit <http://www.desy.de/~twhite/crystfel>

 .SH COPYRIGHT AND DISCLAIMER
 .PD 0
-Copyright © 2012 Thomas White <taw@physics.org>
-.LP
-Copyright © 2012 Richard Kirian <rkirian@asu.edu>
-.LP
-Copyright © 2012 Andrew Aquila <andrew.aquila@cfel.de>
-.LP
-Copyright © 2012 Andrew Martin <andrew.martin@desy.de>
-.LP
-Copyright © 2012 Lorenzo Galli <lorenzo.galli@desy.de>
+Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, a research centre of the Helmholtz Association.
 .PD
 .PP
 Please read the AUTHORS file in the CrystFEL source code distribution for a full list of contributions and contributors.

--- a/doc/man/crystfel_geometry.5
+++ b/doc/man/crystfel_geometry.5
@@ -208,7 +208,7 @@ This page was written by Thomas White.
 Report bugs to <taw@physics.org>, or visit <http://www.desy.de/~twhite/crystfel>.

 .SH COPYRIGHT AND DISCLAIMER
-Copyright © 2012 Thomas White <taw@physics.org>
+Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, a research centre of the Helmholtz Association.
 .P
 CrystFEL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 .P

--- a/doc/man/get_hkl.1
+++ b/doc/man/get_hkl.1
@@ -74,9 +74,9 @@ This page was written by Thomas White.
 Report bugs to <taw@physics.org>, or visit <http://www.desy.de/~twhite/crystfel>.

 .SH COPYRIGHT AND DISCLAIMER
-Copyright © 2012 Thomas White <taw@physics.org>
+Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, a research centre of the Helmholtz Association.
 .P
-get_hkl is part of CrystFEL.
+get_hkl, and this manual, are part of CrystFEL.
 .P
 CrystFEL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 .P

--- a/doc/man/hdfsee.1
+++ b/doc/man/hdfsee.1
@@ -89,9 +89,9 @@ This page was written by Thomas White.
 Report bugs to <taw@physics.org>, or visit <http://www.desy.de/~twhite/crystfel>.

 .SH COPYRIGHT AND DISCLAIMER
-Copyright © 2012 Thomas White <taw@physics.org>
+Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, a research centre of the Helmholtz Association.
 .P
-hdfsee is part of CrystFEL.
+hdfsee, and this manual, are part of CrystFEL.
 .P
 CrystFEL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 .P

--- a/doc/man/indexamajig.1
+++ b/doc/man/indexamajig.1
@@ -384,9 +384,9 @@ This page was written by Thomas White.
 Report bugs to <taw@physics.org>, or visit <http://www.desy.de/~twhite/crystfel>.

 .SH COPYRIGHT AND DISCLAIMER
-Copyright © 2012 Thomas White <taw@physics.org>
+Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, a research centre of the Helmholtz Association.
 .P
-indexamajig is part of CrystFEL.
+indexamajig, and this manual, are part of CrystFEL.
 .P
 CrystFEL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 .P

--- a/doc/man/partial_sim.1
+++ b/doc/man/partial_sim.1
@@ -78,9 +78,9 @@ This page was written by Thomas White.
 Report bugs to <taw@physics.org>, or visit <http://www.desy.de/~twhite/crystfel>.

 .SH COPYRIGHT AND DISCLAIMER
-Copyright © 2012 Thomas White <taw@physics.org>
+Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, a research centre of the Helmholtz Association.
 .P
-partial_sim is part of CrystFEL.
+partial_sim, and this manaul, are part of CrystFEL.
 .P
 CrystFEL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 .P

--- a/doc/man/partialator.1
+++ b/doc/man/partialator.1
@@ -103,9 +103,9 @@ This page was written by Thomas White.
 Report bugs to <taw@physics.org>, or visit <http://www.desy.de/~twhite/crystfel>.

 .SH COPYRIGHT AND DISCLAIMER
-Copyright © 2012 Thomas White <taw@physics.org>
+Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, a research centre of the Helmholtz Association.
 .P
-partialator is part of CrystFEL.
+partialator, and this manual, are part of CrystFEL.
 .P
 CrystFEL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 .P

--- a/doc/man/pattern_sim.1
+++ b/doc/man/pattern_sim.1
@@ -83,9 +83,9 @@ This page was written by Thomas White.
 Report bugs to <taw@physics.org>, or visit <http://www.desy.de/~twhite/crystfel>.

 .SH COPYRIGHT AND DISCLAIMER
-Copyright © 2012 Thomas White <taw@physics.org>
+Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, a research centre of the Helmholtz Association.
 .P
-pattern_sim is part of CrystFEL.
+pattern_sim, and this manual, are part of CrystFEL.
 .P
 CrystFEL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 .P

--- a/doc/man/powder_plot.1
+++ b/doc/man/powder_plot.1
@@ -139,13 +139,10 @@ This page was written by Andrew Aquila and Thomas White.
 Report bugs to <taw@physics.org>, or visit <http://www.desy.de/~twhite/crystfel>.

 .SH COPYRIGHT AND DISCLAIMER
-Copyright © 2012 Andrew Aquila <andrew.aquila@cfel.de>
-.PD 0
-.LP
-Copyright © 2012 Thomas White <taw@physics.org>
+Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, a research centre of the Helmholtz Association.
 .PD
 .P
-powder_plot is part of CrystFEL.
+powder_plot, and this manual, are part of CrystFEL.
 .P
 CrystFEL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 .P

--- a/doc/man/process_hkl.1
+++ b/doc/man/process_hkl.1
@@ -116,9 +116,9 @@ This page was written by Thomas White.
 Report bugs to <taw@physics.org>, or visit <http://www.desy.de/~twhite/crystfel>.

 .SH COPYRIGHT AND DISCLAIMER
-Copyright © 2012 Thomas White <taw@physics.org>
+Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, a research centre of the Helmholtz Association.
 .P
-process_hkl is part of CrystFEL.
+process_hkl, and this manual, are part of CrystFEL.
 .P
 CrystFEL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 .P

--- a/doc/man/render_hkl.1
+++ b/doc/man/render_hkl.1
@@ -95,9 +95,9 @@ This page was written by Thomas White.
 Report bugs to <taw@physics.org>, or visit <http://www.desy.de/~twhite/crystfel>.

 .SH COPYRIGHT AND DISCLAIMER
-Copyright © 2012 Thomas White <taw@physics.org>
+Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, a research centre of the Helmholtz Association.
 .P
-render_hkl is part of CrystFEL.
+render_hkl, and this manual, are part of CrystFEL.
 .P
 CrystFEL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 .P

--- a/libcrystfel/src/beam-parameters.c
+++ b/libcrystfel/src/beam-parameters.c
@@ -3,7 +3,11 @@
 *
 * Beam parameters
 *
- * Copyright © 2012 Thomas White <taw@physics.org>
+ * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY,
+ *                  a research centre of the Helmholtz Association.
+ *
+ * Authors:
+ *   2009-2012 Thomas White <taw@physics.org>
 *
 * This file is part of CrystFEL.
 *

--- a/libcrystfel/src/beam-parameters.h
+++ b/libcrystfel/src/beam-parameters.h
@@ -3,7 +3,11 @@
 *
 * Beam parameters
 *
- * Copyright © 2012 Thomas White <taw@physics.org>
+ * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY,
+ *                  a research centre of the Helmholtz Association.
+ *
+ * Authors:
+ *   2009-2012 Thomas White <taw@physics.org>
 *
 * This file is part of CrystFEL.
 *

--- a/libcrystfel/src/cell.c
+++ b/libcrystfel/src/cell.c
@@ -3,7 +3,11 @@
 *
 * Unit Cell Calculations
 *
- * Copyright © 2012 Thomas White <taw@physics.org>
+ * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY,
+ *                  a research centre of the Helmholtz Association.
+ *
+ * Authors:
+ *   2009-2012 Thomas White <taw@physics.org>
 *
 * This file is part of CrystFEL.
 *

--- a/libcrystfel/src/cell.h
+++ b/libcrystfel/src/cell.h
@@ -3,7 +3,11 @@
 *
 * Unit Cell Calculations
 *
- * Copyright © 2012 Thomas White <taw@physics.org>
+ * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY,
+ *                  a research centre of the Helmholtz Association.
+ *
+ * Authors:
+ *   2009-2012 Thomas White <taw@physics.org>
 *
 * This file is part of CrystFEL.
 *

--- a/libcrystfel/src/detector.c
+++ b/libcrystfel/src/detector.c
@@ -3,8 +3,12 @@
 *
 * Detector properties
 *
- * Copyright © 2012 Thomas White <taw@physics.org>
- * Copyright © 2012 Richard Kirian <rkirian@asu.edu>
+ * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY,
+ *                  a research centre of the Helmholtz Association.
+ *
+ * Authors:
+ *   2009-2012 Thomas White <taw@physics.org>
+ *   2012 Richard Kirian <rkirian@asu.edu>
 *
 * This file is part of CrystFEL.
 *

--- a/libcrystfel/src/detector.h
+++ b/libcrystfel/src/detector.h
@@ -3,8 +3,12 @@
 *
 * Detector properties
 *
- * Copyright © 2012 Thomas White <taw@physics.org>
- * Copyright © 2012 Richard Kirian <rkirian@asu.edu>
+ * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY,
+ *                  a research centre of the Helmholtz Association.
+ *
+ * Authors:
+ *   2009-2012 Thomas White <taw@physics.org>
+ *   2011 Richard Kirian <rkirian@asu.edu>
 *
 * This file is part of CrystFEL.
 *