GPLv3 boilerplate comments

41 files changed, 622 insertions, 114 deletions

diff --git a/libcrystfel/src/beam-parameters.c b/libcrystfel/src/beam-parameters.c
index ac30ad04..082e9651 100644
--- a/libcrystfel/src/beam-parameters.c
+++ b/libcrystfel/src/beam-parameters.c
@@ -3,13 +3,25 @@
  *
  * Beam parameters
  *
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/libcrystfel/src/beam-parameters.h b/libcrystfel/src/beam-parameters.h
index 411ab449..6f5d8a75 100644
--- a/libcrystfel/src/beam-parameters.h
+++ b/libcrystfel/src/beam-parameters.h
@@ -3,13 +3,25 @@
  *
  * Beam parameters
  *
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifndef BEAM_PARAMETERS_H
 #define BEAM_PARAMETERS_H
 
diff --git a/libcrystfel/src/cell.c b/libcrystfel/src/cell.c
index 38bca61c..59910605 100644
--- a/libcrystfel/src/cell.c
+++ b/libcrystfel/src/cell.c
@@ -3,9 +3,22 @@
  *
  * Unit Cell Calculations
  *
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libcrystfel/src/cell.h b/libcrystfel/src/cell.h
index e69ce721..f4b7a7c8 100644
--- a/libcrystfel/src/cell.h
+++ b/libcrystfel/src/cell.h
@@ -3,9 +3,22 @@
  *
  * Unit Cell Calculations
  *
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c
index 91aa6c6e..ee2a8ac5 100644
--- a/libcrystfel/src/detector.c
+++ b/libcrystfel/src/detector.c
@@ -3,14 +3,26 @@
  *
  * Detector properties
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
- * (c) 2011 Rick Kirian <rkirian@asu.edu>
+ * Copyright © 2012 Thomas White <taw@physics.org>
+ * Copyright © 2012 Rick Kirian <rkirian@asu.edu>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #define _ISOC99_SOURCE
 #define _GNU_SOURCE
 #include <stdlib.h>
diff --git a/libcrystfel/src/detector.h b/libcrystfel/src/detector.h
index 0bffd043..74e26cfa 100644
--- a/libcrystfel/src/detector.h
+++ b/libcrystfel/src/detector.h
@@ -3,10 +3,23 @@
  *
  * Detector properties
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
- * (c) 2011 Rick Kirian <rkirian@asu.edu>
+ * Copyright © 2012 Thomas White <taw@physics.org>
+ * Copyright © 2012 Rick Kirian <rkirian@asu.edu>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libcrystfel/src/dirax.c b/libcrystfel/src/dirax.c
index 1abfd64c..b6276fbd 100644
--- a/libcrystfel/src/dirax.c
+++ b/libcrystfel/src/dirax.c
@@ -3,13 +3,25 @@
  *
  * Invoke the DirAx auto-indexing program
  *
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/libcrystfel/src/dirax.h b/libcrystfel/src/dirax.h
index 8c429710..5b89196d 100644
--- a/libcrystfel/src/dirax.h
+++ b/libcrystfel/src/dirax.h
@@ -3,13 +3,25 @@
  *
  * Invoke the DirAx auto-indexing program
  *
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifndef DIRAX_H
 #define DIRAX_H
 
diff --git a/libcrystfel/src/filters.c b/libcrystfel/src/filters.c
index c4e409df..5bfab0ab 100644
--- a/libcrystfel/src/filters.c
+++ b/libcrystfel/src/filters.c
@@ -3,13 +3,25 @@
  *
  * Image filtering
  *
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/libcrystfel/src/filters.h b/libcrystfel/src/filters.h
index 6b35d7e8..1cf8a80c 100644
--- a/libcrystfel/src/filters.h
+++ b/libcrystfel/src/filters.h
@@ -3,13 +3,25 @@
  *
  * Image filtering
  *
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifndef FILTERS_H
 #define FILTERS_H
 
diff --git a/libcrystfel/src/geometry.c b/libcrystfel/src/geometry.c
index e05cbdc7..1aa834ec 100644
--- a/libcrystfel/src/geometry.c
+++ b/libcrystfel/src/geometry.c
@@ -3,9 +3,22 @@
  *
  * Geometry of diffraction
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libcrystfel/src/geometry.h b/libcrystfel/src/geometry.h
index 943a95b0..5264e4ee 100644
--- a/libcrystfel/src/geometry.h
+++ b/libcrystfel/src/geometry.h
@@ -3,9 +3,22 @@
  *
  * Geometry of diffraction
  *
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libcrystfel/src/hdf5-file.c b/libcrystfel/src/hdf5-file.c
index d488de7a..05cff70c 100644
--- a/libcrystfel/src/hdf5-file.c
+++ b/libcrystfel/src/hdf5-file.c
@@ -3,13 +3,25 @@
  *
  * Read/write HDF5 data files
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/libcrystfel/src/hdf5-file.h b/libcrystfel/src/hdf5-file.h
index 385e919c..eec71554 100644
--- a/libcrystfel/src/hdf5-file.h
+++ b/libcrystfel/src/hdf5-file.h
@@ -3,9 +3,22 @@
  *
  * Read/write HDF5 data files
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c
index a682f87d..e54e645c 100644
--- a/libcrystfel/src/image.c
+++ b/libcrystfel/src/image.c
@@ -3,13 +3,25 @@
  *
  * Handle images and image features
  *
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #define _ISOC99_SOURCE
 #include <stdlib.h>
 #include <assert.h>
diff --git a/libcrystfel/src/image.h b/libcrystfel/src/image.h
index 5f11b425..a6120066 100644
--- a/libcrystfel/src/image.h
+++ b/libcrystfel/src/image.h
@@ -3,13 +3,25 @@
  *
  * Handle images and image features
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/libcrystfel/src/index-priv.h b/libcrystfel/src/index-priv.h
index 3d8c8a22..566c72fa 100644
--- a/libcrystfel/src/index-priv.h
+++ b/libcrystfel/src/index-priv.h
@@ -3,13 +3,25 @@
  *
  * Indexing private data
  *
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifndef INDEXPRIV_H
 #define INDEXPRIV_H
 
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c
index 31239179..d97ef07c 100644
--- a/libcrystfel/src/index.c
+++ b/libcrystfel/src/index.c
@@ -3,14 +3,26 @@
  *
  * Perform indexing (somehow)
  *
- * (c) 2006-2012 Thomas White <taw@physics.org>
- * (c) 2010 Richard Kirian <rkirian@asu.edu>
+ * Copyright © 2012 Thomas White <taw@physics.org>
+ * Copyright © 2012 Rick Kirian <rkirian@asu.edu>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/libcrystfel/src/index.h b/libcrystfel/src/index.h
index 1457e93f..464e754a 100644
--- a/libcrystfel/src/index.h
+++ b/libcrystfel/src/index.h
@@ -3,13 +3,25 @@
  *
  * Perform indexing (somehow)
  *
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifndef INDEX_H
 #define INDEX_H
 
diff --git a/libcrystfel/src/mosflm.c b/libcrystfel/src/mosflm.c
index f415271c..c344dd53 100644
--- a/libcrystfel/src/mosflm.c
+++ b/libcrystfel/src/mosflm.c
@@ -3,10 +3,23 @@
  *
  * Invoke the DPS auto-indexing algorithm through MOSFLM
  *
- * (c) 2010 Richard Kirian <rkirian@asu.edu>
- * (c) 2006-2012 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
+ * Copyright © 2012 Richard Kirian <rkirian@asu.edu>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libcrystfel/src/mosflm.h b/libcrystfel/src/mosflm.h
index 82b80a44..c7b52241 100644
--- a/libcrystfel/src/mosflm.h
+++ b/libcrystfel/src/mosflm.h
@@ -3,14 +3,26 @@
  *
  * Invoke the DPS auto-indexing algorithm through MOSFLM
  *
- * (c) 2010 Richard Kirian <rkirian@asu.edu>
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
+ * Copyright © 2012 Rick Kirian <rkirian@asu.edu>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifndef MOSFLM_H
 #define MOSFLM_H
 
diff --git a/libcrystfel/src/peaks.c b/libcrystfel/src/peaks.c
index 067d32a4..fa765b65 100644
--- a/libcrystfel/src/peaks.c
+++ b/libcrystfel/src/peaks.c
@@ -3,10 +3,23 @@
  *
  * Peak search and other image analysis
  *
- * (c) 2006-2012 Thomas White <taw@physics.org>
- *	    2011 Andrew Martin
+ * Copyright © 2012 Thomas White <taw@physics.org>
+ * Copyright © 2012 Andrew Martin <andrew.martin@desy.de>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libcrystfel/src/peaks.h b/libcrystfel/src/peaks.h
index ffeb896b..2360dc42 100644
--- a/libcrystfel/src/peaks.h
+++ b/libcrystfel/src/peaks.h
@@ -3,13 +3,25 @@
  *
  * Peak search and other image analysis
  *
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifndef PEAKS_H
 #define PEAKS_H
 
diff --git a/libcrystfel/src/reax.c b/libcrystfel/src/reax.c
index d624e236..057a89aa 100644
--- a/libcrystfel/src/reax.c
+++ b/libcrystfel/src/reax.c
@@ -3,13 +3,25 @@
  *
  * A new auto-indexer
  *
- * (c) 2011-2012 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/libcrystfel/src/reax.h b/libcrystfel/src/reax.h
index 60decac9..af514b89 100644
--- a/libcrystfel/src/reax.h
+++ b/libcrystfel/src/reax.h
@@ -3,13 +3,25 @@
  *
  * A new auto-indexer
  *
- * (c) 2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifndef REAX_H
 #define REAX_H
 
diff --git a/libcrystfel/src/reflist-utils.c b/libcrystfel/src/reflist-utils.c
index 66bd377e..8ad33f3f 100644
--- a/libcrystfel/src/reflist-utils.c
+++ b/libcrystfel/src/reflist-utils.c
@@ -3,13 +3,25 @@
  *
  * Utilities to complement the core reflist.c
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #define _ISOC99_SOURCE
 #define _GNU_SOURCE
 #include <math.h>
diff --git a/libcrystfel/src/reflist-utils.h b/libcrystfel/src/reflist-utils.h
index 2da0dec1..f03be906 100644
--- a/libcrystfel/src/reflist-utils.h
+++ b/libcrystfel/src/reflist-utils.h
@@ -3,9 +3,22 @@
  *
  * Utilities to complement the core reflist.c
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libcrystfel/src/reflist.c b/libcrystfel/src/reflist.c
index 18856c67..4bfa113c 100644
--- a/libcrystfel/src/reflist.c
+++ b/libcrystfel/src/reflist.c
@@ -3,13 +3,25 @@
  *
  * Fast reflection/peak list
  *
- * (c) 2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #include <stdlib.h>
 #include <assert.h>
 #include <stdio.h>
diff --git a/libcrystfel/src/reflist.h b/libcrystfel/src/reflist.h
index 955db69b..fe1ca2af 100644
--- a/libcrystfel/src/reflist.h
+++ b/libcrystfel/src/reflist.h
@@ -3,9 +3,22 @@
  *
  * Fast reflection/peak list
  *
- * (c) 2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libcrystfel/src/render.c b/libcrystfel/src/render.c
index 896d3eca..2d61a399 100644
--- a/libcrystfel/src/render.c
+++ b/libcrystfel/src/render.c
@@ -3,9 +3,22 @@
  *
  * Render a high dynamic range buffer in some sensible way
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libcrystfel/src/render.h b/libcrystfel/src/render.h
index f456616f..836909ad 100644
--- a/libcrystfel/src/render.h
+++ b/libcrystfel/src/render.h
@@ -3,13 +3,25 @@
  *
  * Render a high dynamic range buffer in some sensible way
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/libcrystfel/src/statistics.c b/libcrystfel/src/statistics.c
index 83cac13c..24def424 100644
--- a/libcrystfel/src/statistics.c
+++ b/libcrystfel/src/statistics.c
@@ -3,13 +3,25 @@
  *
  * Structure-factor statistics
  *
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/libcrystfel/src/statistics.h b/libcrystfel/src/statistics.h
index 8fa78ea6..8b2c957c 100644
--- a/libcrystfel/src/statistics.h
+++ b/libcrystfel/src/statistics.h
@@ -3,9 +3,22 @@
  *
  * Structure-factor statistics
  *
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libcrystfel/src/stream.c b/libcrystfel/src/stream.c
index b713e399..165e9085 100644
--- a/libcrystfel/src/stream.c
+++ b/libcrystfel/src/stream.c
@@ -3,10 +3,23 @@
  *
  * Stream tools
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
- * (c) 2011 Rick Kirian <rkirian@asu.edu>
+ * Copyright © 2012 Thomas White <taw@physics.org>
+ * Copyright © 2012 Rick Kirian <rkirian@asu.edu>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libcrystfel/src/stream.h b/libcrystfel/src/stream.h
index ba218fb9..f3958097 100644
--- a/libcrystfel/src/stream.h
+++ b/libcrystfel/src/stream.h
@@ -3,9 +3,22 @@
  *
  * Stream tools
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libcrystfel/src/symmetry.c b/libcrystfel/src/symmetry.c
index c961b7be..d46614a6 100644
--- a/libcrystfel/src/symmetry.c
+++ b/libcrystfel/src/symmetry.c
@@ -3,13 +3,25 @@
  *
  * Symmetry
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/libcrystfel/src/symmetry.h b/libcrystfel/src/symmetry.h
index 78a13922..ac61b7f1 100644
--- a/libcrystfel/src/symmetry.h
+++ b/libcrystfel/src/symmetry.h
@@ -3,13 +3,25 @@
  *
  * Symmetry
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifndef SYMMETRY_H
 #define SYMMETRY_H
 
diff --git a/libcrystfel/src/thread-pool.c b/libcrystfel/src/thread-pool.c
index 0ae26e17..cd092351 100644
--- a/libcrystfel/src/thread-pool.c
+++ b/libcrystfel/src/thread-pool.c
@@ -3,13 +3,25 @@
  *
  * A thread pool implementation
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/libcrystfel/src/thread-pool.h b/libcrystfel/src/thread-pool.h
index a99a7ade..33849e25 100644
--- a/libcrystfel/src/thread-pool.h
+++ b/libcrystfel/src/thread-pool.h
@@ -3,13 +3,25 @@
  *
  * A thread pool implementation
  *
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-
 #ifndef THREAD_POOL_H
 #define THREAD_POOL_H
 
diff --git a/libcrystfel/src/utils.c b/libcrystfel/src/utils.c
index 6242cc95..bc1408e7 100644
--- a/libcrystfel/src/utils.c
+++ b/libcrystfel/src/utils.c
@@ -3,9 +3,22 @@
  *
  * Utility stuff
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libcrystfel/src/utils.h b/libcrystfel/src/utils.h
index ab86097b..8d5ee479 100644
--- a/libcrystfel/src/utils.h
+++ b/libcrystfel/src/utils.h
@@ -3,9 +3,22 @@
  *
  * Utility stuff
  *
- * (c) 2006-2011 Thomas White <taw@physics.org>
+ * Copyright © 2012 Thomas White <taw@physics.org>
  *
- * Part of CrystFEL - crystallography with a FEL
+ * This file is part of CrystFEL.
+ *
+ * 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.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */