Update licence notices in line with recommendations from TT

31 files changed, 158 insertions, 34 deletions

diff --git a/src/check_hkl.c b/src/check_hkl.c
index 9473f9f6..9698ffc2 100644
--- a/src/check_hkl.c
+++ b/src/check_hkl.c
@@ -3,7 +3,11 @@
  *
  * Characterise reflection lists
  *
- * 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.
  *
diff --git a/src/cl-utils.c b/src/cl-utils.c
index 3c45978a..d533a249 100644
--- a/src/cl-utils.c
+++ b/src/cl-utils.c
@@ -3,7 +3,11 @@
  *
  * OpenCL utility functions
  *
- * 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.
  *
diff --git a/src/cl-utils.h b/src/cl-utils.h
index 6b88e61e..ca8357e2 100644
--- a/src/cl-utils.h
+++ b/src/cl-utils.h
@@ -3,7 +3,11 @@
  *
  * OpenCL utility functions
  *
- * 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.
  *
diff --git a/src/compare_hkl.c b/src/compare_hkl.c
index dde90990..bafc5cdd 100644
--- a/src/compare_hkl.c
+++ b/src/compare_hkl.c
@@ -3,7 +3,11 @@
  *
  * Compare reflection lists
  *
- * 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.
  *
diff --git a/src/diffraction-gpu.c b/src/diffraction-gpu.c
index cfb3c187..56ae179f 100644
--- a/src/diffraction-gpu.c
+++ b/src/diffraction-gpu.c
@@ -3,7 +3,11 @@
  *
  * Calculate diffraction patterns by Fourier methods (GPU version)
  *
- * 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.
  *
diff --git a/src/diffraction-gpu.h b/src/diffraction-gpu.h
index dc95a43f..3be979b7 100644
--- a/src/diffraction-gpu.h
+++ b/src/diffraction-gpu.h
@@ -3,7 +3,11 @@
  *
  * Calculate diffraction patterns by Fourier methods (GPU version)
  *
- * 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.
  *
diff --git a/src/diffraction.c b/src/diffraction.c
index 429931c2..9c6509e1 100644
--- a/src/diffraction.c
+++ b/src/diffraction.c
@@ -3,7 +3,11 @@
  *
  * Calculate diffraction patterns by Fourier methods
  *
- * 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.
  *
diff --git a/src/diffraction.h b/src/diffraction.h
index 8f33c2c1..b7e34a0e 100644
--- a/src/diffraction.h
+++ b/src/diffraction.h
@@ -3,7 +3,11 @@
  *
  * Calculate diffraction patterns by Fourier methods
  *
- * 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.
  *
diff --git a/src/dw-hdfsee.c b/src/dw-hdfsee.c
index 7870e60f..2abdafcc 100644
--- a/src/dw-hdfsee.c
+++ b/src/dw-hdfsee.c
@@ -3,7 +3,11 @@
  *
  * Quick yet non-crappy HDF viewer
  *
- * 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.
  *
diff --git a/src/dw-hdfsee.h b/src/dw-hdfsee.h
index 23584723..448db582 100644
--- a/src/dw-hdfsee.h
+++ b/src/dw-hdfsee.h
@@ -3,7 +3,11 @@
  *
  * Quick yet non-crappy HDF viewer
  *
- * 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.
  *
diff --git a/src/get_hkl.c b/src/get_hkl.c
index cec55495..9f86f0f7 100644
--- a/src/get_hkl.c
+++ b/src/get_hkl.c
@@ -3,7 +3,11 @@
  *
  * Small program to manipulate reflection lists
  *
- * 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.
  *
diff --git a/src/hdfsee-render.c b/src/hdfsee-render.c
index e5af371f..9576f349 100644
--- a/src/hdfsee-render.c
+++ b/src/hdfsee-render.c
@@ -3,7 +3,11 @@
  *
  * Rendering bits for hdfsee
  *
- * 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.
  *
diff --git a/src/hdfsee-render.h b/src/hdfsee-render.h
index c825bcf0..488694f5 100644
--- a/src/hdfsee-render.h
+++ b/src/hdfsee-render.h
@@ -3,7 +3,11 @@
  *
  * Rendering bits for hdfsee
  *
- * 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.
  *
diff --git a/src/hdfsee.c b/src/hdfsee.c
index 05c9e1dd..5e1ac75f 100644
--- a/src/hdfsee.c
+++ b/src/hdfsee.c
@@ -3,7 +3,11 @@
  *
  * Quick yet non-crappy HDF viewer
  *
- * 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.
  *
diff --git a/src/hdfsee.h b/src/hdfsee.h
index e159d49b..41b6258b 100644
--- a/src/hdfsee.h
+++ b/src/hdfsee.h
@@ -3,7 +3,11 @@
  *
  * Quick yet non-crappy HDF viewer
  *
- * 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.
  *
diff --git a/src/hrs-scaling.c b/src/hrs-scaling.c
index 21a34bbf..7e47acef 100644
--- a/src/hrs-scaling.c
+++ b/src/hrs-scaling.c
@@ -3,7 +3,11 @@
  *
  * Intensity scaling using generalised HRS target function
  *
- * 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.
  *
diff --git a/src/hrs-scaling.h b/src/hrs-scaling.h
index d13ef66d..acb0f24a 100644
--- a/src/hrs-scaling.h
+++ b/src/hrs-scaling.h
@@ -3,7 +3,11 @@
  *
  * Intensity scaling using generalised HRS target function
  *
- * 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.
  *
diff --git a/src/indexamajig.c b/src/indexamajig.c
index 859b475e..9e44f8dc 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -3,7 +3,11 @@
  *
  * Index patterns, output hkl+intensity etc.
  *
- * 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.
  *
diff --git a/src/list_tmp.h b/src/list_tmp.h
index 064efc8d..70e9a32c 100644
--- a/src/list_tmp.h
+++ b/src/list_tmp.h
@@ -19,7 +19,11 @@
  */
 
 /*
- * 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.
  *
diff --git a/src/partial_sim.c b/src/partial_sim.c
index 90e29ce4..e05c392e 100644
--- a/src/partial_sim.c
+++ b/src/partial_sim.c
@@ -3,7 +3,11 @@
  *
  * Generate partials for testing scaling
  *
- * 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.
  *
diff --git a/src/partialator.c b/src/partialator.c
index eb2a8e52..a7a9af8c 100644
--- a/src/partialator.c
+++ b/src/partialator.c
@@ -3,7 +3,11 @@
  *
  * Scaling and post refinement for coherent nanocrystallography
  *
- * 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.
  *
diff --git a/src/pattern_sim.c b/src/pattern_sim.c
index 1ed6b8ba..c207e0dc 100644
--- a/src/pattern_sim.c
+++ b/src/pattern_sim.c
@@ -3,7 +3,11 @@
  *
  * Simulate diffraction patterns from small crystals
  *
- * 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.
  *
diff --git a/src/pattern_sim.h b/src/pattern_sim.h
index 496dcfa7..1a7b3d09 100644
--- a/src/pattern_sim.h
+++ b/src/pattern_sim.h
@@ -3,7 +3,11 @@
  *
  * Simulate diffraction patterns from small crystals
  *
- * 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.
  *
diff --git a/src/post-refinement.c b/src/post-refinement.c
index 783ee238..5a6b2e82 100644
--- a/src/post-refinement.c
+++ b/src/post-refinement.c
@@ -3,7 +3,11 @@
  *
  * Post refinement
  *
- * 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.
  *
diff --git a/src/post-refinement.h b/src/post-refinement.h
index 364dc1a6..3917eec4 100644
--- a/src/post-refinement.h
+++ b/src/post-refinement.h
@@ -3,7 +3,11 @@
  *
  * Post refinement
  *
- * 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.
  *
diff --git a/src/powder_plot.c b/src/powder_plot.c
index 82890a02..74349a95 100644
--- a/src/powder_plot.c
+++ b/src/powder_plot.c
@@ -3,8 +3,12 @@
  *
  * Plot powder patterns
  *
- * Copyright © 2012 Thomas White <taw@physics.org>
- * Copyright © 2012 Andrew Aquila <andrew.aquila@cfel.de>
+ * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY,
+ *                  a research centre of the Helmholtz Association.
+ *
+ * Authors:
+ *   2009-2012 Thomas White <taw@physics.org>
+ *   2010-2012 Andrew Aquila <andrew.aquila@cfel.de>
  *
  * This file is part of CrystFEL.
  *
diff --git a/src/process_hkl.c b/src/process_hkl.c
index e0318489..2beeace2 100644
--- a/src/process_hkl.c
+++ b/src/process_hkl.c
@@ -3,9 +3,13 @@
  *
  * Assemble and process FEL Bragg intensities
  *
- * Copyright © 2012 Thomas White <taw@physics.org>
- * 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:
+ *   2009-2012 Thomas White <taw@physics.org>
+ *   2010-2011 Andrew Martin <andrew.martin@desy.de>
+ *   2012 Lorenzo Galli <lorenzo.galli@desy.de>
  *
  * This file is part of CrystFEL.
  *
diff --git a/src/render_hkl.c b/src/render_hkl.c
index 64d3bf4e..d2872c8c 100644
--- a/src/render_hkl.c
+++ b/src/render_hkl.c
@@ -3,7 +3,11 @@
  *
  * Draw pretty renderings of reflection lists
  *
- * 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.
  *
diff --git a/src/render_hkl.h b/src/render_hkl.h
index 02ed040f..7d40295f 100644
--- a/src/render_hkl.h
+++ b/src/render_hkl.h
@@ -3,7 +3,11 @@
  *
  * Draw pretty renderings of reflection lists
  *
- * 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.
  *
diff --git a/src/scaling-report.c b/src/scaling-report.c
index b18f76cd..d3d5e26b 100644
--- a/src/scaling-report.c
+++ b/src/scaling-report.c
@@ -3,7 +3,11 @@
  *
  * Write a nice PDF of scaling 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.
  *
diff --git a/src/scaling-report.h b/src/scaling-report.h
index 529544a9..d3b3bc4a 100644
--- a/src/scaling-report.h
+++ b/src/scaling-report.h
@@ -3,7 +3,11 @@
  *
  * Write a nice PDF of scaling 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.
  *