diff options
60 files changed, 99 insertions, 66 deletions
diff --git a/libcrystfel/src/beam-parameters.c b/libcrystfel/src/beam-parameters.c index 282a4806..bc5ee67c 100644 --- a/libcrystfel/src/beam-parameters.c +++ b/libcrystfel/src/beam-parameters.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010,2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/beam-parameters.h b/libcrystfel/src/beam-parameters.h index e49b7d26..fe3d3c56 100644 --- a/libcrystfel/src/beam-parameters.h +++ b/libcrystfel/src/beam-parameters.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010,2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/cell.c b/libcrystfel/src/cell.c index d6cceb67..8412fc62 100644 --- a/libcrystfel/src/cell.c +++ b/libcrystfel/src/cell.c @@ -5,9 +5,13 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Richard Kirian + * Copyright © 2012 Lorenzo Galli * * Authors: * 2009-2012 Thomas White <taw@physics.org> + * 2010 Richard Kirian + * 2012 Lorenzo Galli * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/cell.h b/libcrystfel/src/cell.h index b15eaa97..cbe84772 100644 --- a/libcrystfel/src/cell.h +++ b/libcrystfel/src/cell.h @@ -5,9 +5,13 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Richard Kirian + * Copyright © 2012 Lorenzo Galli * * Authors: * 2009-2012 Thomas White <taw@physics.org> + * 2010,2012 Richard Kirian + * 2012 Lorenzo Galli * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c index 491f7e8a..50874efd 100644 --- a/libcrystfel/src/detector.c +++ b/libcrystfel/src/detector.c @@ -5,10 +5,12 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Richard Kirian * * Authors: * 2009-2012 Thomas White <taw@physics.org> - * 2012 Richard Kirian <rkirian@asu.edu> + * 2011 Andrew Aquila + * 2011 Richard Kirian <rkirian@asu.edu> * * This file is part of CrystFEL. * @@ -603,8 +605,6 @@ static int parse_field_for_panel(struct panel *panel, const char *key, panel->res = atof(val); } else if ( strcmp(key, "peak_sep") == 0 ) { panel->peak_sep = atof(val); - } else if ( strcmp(key, "integr_radius") == 0 ) { - panel->integr_radius = atof(val); } else if ( strcmp(key, "badrow_direction") == 0 ) { panel->badrow = val[0]; /* First character only */ if ( (panel->badrow != 'x') && (panel->badrow != 'y') @@ -684,8 +684,6 @@ static void parse_toplevel(struct detector *det, const char *key, } else if ( strcmp(key, "peak_sep") == 0 ) { det->defaults.peak_sep = atof(val); - } else if ( strcmp(key, "integr_radius") == 0 ) { - det->defaults.integr_radius = atof(val); } else if ( strcmp(key, "coffset") == 0 ) { det->defaults.coffset = atof(val); } else if ( parse_field_for_panel(&det->defaults, key, val, det) ) { @@ -736,7 +734,6 @@ struct detector *get_detector_geometry(const char *filename) det->defaults.badrow = '-'; det->defaults.no_index = 0; det->defaults.peak_sep = 50.0; - det->defaults.integr_radius = 3.0; det->defaults.fsx = 1.0; det->defaults.fsy = 0.0; det->defaults.ssx = 0.0; diff --git a/libcrystfel/src/detector.h b/libcrystfel/src/detector.h index 7214ac29..02d66cd4 100644 --- a/libcrystfel/src/detector.h +++ b/libcrystfel/src/detector.h @@ -5,10 +5,12 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Richard Kirian * * Authors: * 2009-2012 Thomas White <taw@physics.org> - * 2011 Richard Kirian <rkirian@asu.edu> + * 2011-2012 Richard Kirian <rkirian@asu.edu> + * 2011 Andrew Aquila * * This file is part of CrystFEL. * @@ -61,7 +63,6 @@ struct panel char badrow; /* 'x' or 'y' */ int no_index; /* Don't index peaks in this panel if non-zero */ double peak_sep; /* Characteristic peak separation */ - double integr_radius; /* Peak integration radius */ char *rigid_group; /* Rigid group, or -1 for none */ double adu_per_eV; /* Number of ADU per eV */ diff --git a/libcrystfel/src/dirax.c b/libcrystfel/src/dirax.c index 9460ee0d..20f48bd3 100644 --- a/libcrystfel/src/dirax.c +++ b/libcrystfel/src/dirax.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/dirax.h b/libcrystfel/src/dirax.h index 70bd6e69..ce3cd4b0 100644 --- a/libcrystfel/src/dirax.h +++ b/libcrystfel/src/dirax.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010,2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/filters.c b/libcrystfel/src/filters.c index 88480544..0b84eb14 100644 --- a/libcrystfel/src/filters.c +++ b/libcrystfel/src/filters.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/filters.h b/libcrystfel/src/filters.h index 2153fe9e..bda480c9 100644 --- a/libcrystfel/src/filters.h +++ b/libcrystfel/src/filters.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010,2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/geometry.c b/libcrystfel/src/geometry.c index e1dfa8cb..6a807d3b 100644 --- a/libcrystfel/src/geometry.c +++ b/libcrystfel/src/geometry.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/geometry.h b/libcrystfel/src/geometry.h index 3a333794..94b496e6 100644 --- a/libcrystfel/src/geometry.h +++ b/libcrystfel/src/geometry.h @@ -5,9 +5,11 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Richard Kirian * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-2012 Thomas White <taw@physics.org> + * 2012 Richard Kirian * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c index 1ff7eb29..093e20f2 100644 --- a/libcrystfel/src/image.c +++ b/libcrystfel/src/image.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2011-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/index-priv.h b/libcrystfel/src/index-priv.h index 35789551..6fccee9f 100644 --- a/libcrystfel/src/index-priv.h +++ b/libcrystfel/src/index-priv.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010,2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c index 49d9218e..3d0f164b 100644 --- a/libcrystfel/src/index.c +++ b/libcrystfel/src/index.c @@ -5,10 +5,12 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Lorenzo Galli * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-2012 Thomas White <taw@physics.org> * 2010-2011 Richard Kirian <rkirian@asu.edu> + * 2012 Lorenzo Galli * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/index.h b/libcrystfel/src/index.h index e8af1735..c4e15f09 100644 --- a/libcrystfel/src/index.h +++ b/libcrystfel/src/index.h @@ -5,9 +5,13 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Richard Kirian + * Copyright © 2012 Lorenzo Galli * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-2012 Thomas White <taw@physics.org> + * 2010 Richard Kirian + * 2012 Lorenzo Galli * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/mosflm.c b/libcrystfel/src/mosflm.c index 096810de..3e29a4f8 100644 --- a/libcrystfel/src/mosflm.c +++ b/libcrystfel/src/mosflm.c @@ -5,10 +5,11 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Richard Kirian * * Authors: - * 2009-2012 Thomas White <taw@physics.org> - * 2010-2011 Richard Kirian <rkirian@asu.edu> + * 2010 Richard Kirian <rkirian@asu.edu> + * 2010-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/mosflm.h b/libcrystfel/src/mosflm.h index 808dc2c2..ba1eb73d 100644 --- a/libcrystfel/src/mosflm.h +++ b/libcrystfel/src/mosflm.h @@ -5,10 +5,11 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Richard Kirian * * Authors: - * 2009-2012 Thomas White <taw@physics.org> - * 2010-2011 Richard Kirian <rkirian@asu.edu> + * 2010 Richard Kirian <rkirian@asu.edu> + * 2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/peaks.c b/libcrystfel/src/peaks.c index 4d095b13..544dd777 100644 --- a/libcrystfel/src/peaks.c +++ b/libcrystfel/src/peaks.c @@ -5,10 +5,12 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Richard Kirian * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-2012 Thomas White <taw@physics.org> * 2011 Andrew Martin <andrew.martin@desy.de> + * 2011 Richard Kirian * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/peaks.h b/libcrystfel/src/peaks.h index 05ef8ff1..afc7b868 100644 --- a/libcrystfel/src/peaks.h +++ b/libcrystfel/src/peaks.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/reax.c b/libcrystfel/src/reax.c index 64864dce..58dce40a 100644 --- a/libcrystfel/src/reax.c +++ b/libcrystfel/src/reax.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2011-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/reax.h b/libcrystfel/src/reax.h index 713cfb73..01dfe649 100644 --- a/libcrystfel/src/reax.h +++ b/libcrystfel/src/reax.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2011-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/reflist-utils.c b/libcrystfel/src/reflist-utils.c index bd6705f7..1af48507 100644 --- a/libcrystfel/src/reflist-utils.c +++ b/libcrystfel/src/reflist-utils.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2011-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/reflist-utils.h b/libcrystfel/src/reflist-utils.h index ce7db7bd..f371c64d 100644 --- a/libcrystfel/src/reflist-utils.h +++ b/libcrystfel/src/reflist-utils.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2011-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/reflist.c b/libcrystfel/src/reflist.c index 041c02b8..24550012 100644 --- a/libcrystfel/src/reflist.c +++ b/libcrystfel/src/reflist.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2011-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/reflist.h b/libcrystfel/src/reflist.h index 2a74cf64..c9bb8f0d 100644 --- a/libcrystfel/src/reflist.h +++ b/libcrystfel/src/reflist.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2011-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/stream.c b/libcrystfel/src/stream.c index d4286bd4..0b6765fb 100644 --- a/libcrystfel/src/stream.c +++ b/libcrystfel/src/stream.c @@ -5,10 +5,12 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Richard Kirian * * Authors: - * 2009-2012 Thomas White <taw@physics.org> - * 2011 Richard Kirian <rkirian@asu.edu> + * 2010-2012 Thomas White <taw@physics.org> + * 2011 Richard Kirian + * 2011 Andrew Aquila * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/stream.h b/libcrystfel/src/stream.h index ed9ed563..a544798f 100644 --- a/libcrystfel/src/stream.h +++ b/libcrystfel/src/stream.h @@ -7,7 +7,8 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-2012 Thomas White <taw@physics.org> + * 2011 Andrew Aquila * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/symmetry.c b/libcrystfel/src/symmetry.c index d14b4f09..ab837ec0 100644 --- a/libcrystfel/src/symmetry.c +++ b/libcrystfel/src/symmetry.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/symmetry.h b/libcrystfel/src/symmetry.h index 1c874eda..b600bbc0 100644 --- a/libcrystfel/src/symmetry.h +++ b/libcrystfel/src/symmetry.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/thread-pool.c b/libcrystfel/src/thread-pool.c index dc53a50e..6824947c 100644 --- a/libcrystfel/src/thread-pool.c +++ b/libcrystfel/src/thread-pool.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/libcrystfel/src/thread-pool.h b/libcrystfel/src/thread-pool.h index 0bb20fc8..7f07f78d 100644 --- a/libcrystfel/src/thread-pool.h +++ b/libcrystfel/src/thread-pool.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/src/check_hkl.c b/src/check_hkl.c index 9698ffc2..fa5fb0b7 100644 --- a/src/check_hkl.c +++ b/src/check_hkl.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-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 d533a249..ae146ed0 100644 --- a/src/cl-utils.c +++ b/src/cl-utils.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-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 ca8357e2..e5546b01 100644 --- a/src/cl-utils.h +++ b/src/cl-utils.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-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 bafc5cdd..fee30247 100644 --- a/src/compare_hkl.c +++ b/src/compare_hkl.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-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 56ae179f..2b8e97e5 100644 --- a/src/diffraction-gpu.c +++ b/src/diffraction-gpu.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-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 3be979b7..349a6bff 100644 --- a/src/diffraction-gpu.h +++ b/src/diffraction-gpu.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-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 2abdafcc..3881d162 100644 --- a/src/dw-hdfsee.c +++ b/src/dw-hdfsee.c @@ -5,9 +5,11 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Richard Kirian * * Authors: * 2009-2012 Thomas White <taw@physics.org> + * 2012 Richard Kirian * * This file is part of CrystFEL. * diff --git a/src/dw-hdfsee.h b/src/dw-hdfsee.h index 448db582..6d8c9782 100644 --- a/src/dw-hdfsee.h +++ b/src/dw-hdfsee.h @@ -5,9 +5,11 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Richard Kirian * * Authors: * 2009-2012 Thomas White <taw@physics.org> + * 2012 Richard Kirian * * This file is part of CrystFEL. * diff --git a/src/hdfsee-render.c b/src/hdfsee-render.c index 9576f349..92bfb786 100644 --- a/src/hdfsee-render.c +++ b/src/hdfsee-render.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2011-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 488694f5..c3bd5525 100644 --- a/src/hdfsee-render.h +++ b/src/hdfsee-render.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2011-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/src/hdfsee.c b/src/hdfsee.c index 5e1ac75f..22302ec8 100644 --- a/src/hdfsee.c +++ b/src/hdfsee.c @@ -5,9 +5,11 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Richard Kirian * * Authors: * 2009-2012 Thomas White <taw@physics.org> + * 2012 Richard Kirian * * This file is part of CrystFEL. * diff --git a/src/hdfsee.h b/src/hdfsee.h index 41b6258b..eb585f90 100644 --- a/src/hdfsee.h +++ b/src/hdfsee.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2009, 2011-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 7e47acef..3ae0d563 100644 --- a/src/hrs-scaling.c +++ b/src/hrs-scaling.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-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 acb0f24a..5425b1ff 100644 --- a/src/hrs-scaling.h +++ b/src/hrs-scaling.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/src/indexamajig.c b/src/indexamajig.c index 9e44f8dc..6927f1b9 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -5,9 +5,13 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Richard Kirian + * Copyright © 2012 Lorenzo Galli * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-2012 Thomas White <taw@physics.org> + * 2011 Richard Kirian + * 2012 Lorenzo Galli * * This file is part of CrystFEL. * diff --git a/src/list_tmp.h b/src/list_tmp.h index 70e9a32c..8fac4688 100644 --- a/src/list_tmp.h +++ b/src/list_tmp.h @@ -23,7 +23,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2009-2010,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 e05c392e..31822eca 100644 --- a/src/partial_sim.c +++ b/src/partial_sim.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2011-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/src/partialator.c b/src/partialator.c index a7a9af8c..fa0698b5 100644 --- a/src/partialator.c +++ b/src/partialator.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-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 1a7b3d09..61bd87d0 100644 --- a/src/pattern_sim.h +++ b/src/pattern_sim.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2011-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 5a6b2e82..2ff408eb 100644 --- a/src/post-refinement.c +++ b/src/post-refinement.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-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 3917eec4..2223dcdf 100644 --- a/src/post-refinement.h +++ b/src/post-refinement.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-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 74349a95..5423d759 100644 --- a/src/powder_plot.c +++ b/src/powder_plot.c @@ -5,10 +5,12 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Richard Kirian * * Authors: - * 2009-2012 Thomas White <taw@physics.org> - * 2010-2012 Andrew Aquila <andrew.aquila@cfel.de> + * 2010-2012 Thomas White <taw@physics.org> + * 2011-2012 Andrew Aquila <andrew.aquila@cfel.de> + * 2011 Richard Kirian * * This file is part of CrystFEL. * diff --git a/src/process_hkl.c b/src/process_hkl.c index 2beeace2..4164d6f6 100644 --- a/src/process_hkl.c +++ b/src/process_hkl.c @@ -5,11 +5,12 @@ * * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. + * Copyright © 2012 Lorenzo Galli * * Authors: * 2009-2012 Thomas White <taw@physics.org> - * 2010-2011 Andrew Martin <andrew.martin@desy.de> - * 2012 Lorenzo Galli <lorenzo.galli@desy.de> + * 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 d2872c8c..a63cbad3 100644 --- a/src/render_hkl.c +++ b/src/render_hkl.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-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 7d40295f..3f2624c6 100644 --- a/src/render_hkl.h +++ b/src/render_hkl.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010,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 9c8504ef..4c2390b5 100644 --- a/src/scaling-report.c +++ b/src/scaling-report.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2010-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 d3b3bc4a..b9ac3fb7 100644 --- a/src/scaling-report.h +++ b/src/scaling-report.h @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2011-2012 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * diff --git a/tests/integration_check.c b/tests/integration_check.c index 0eacd6ba..7e812ad5 100644 --- a/tests/integration_check.c +++ b/tests/integration_check.c @@ -196,7 +196,6 @@ int main(int argc, char *argv[]) image.det->panels[0].cny = -64.0; image.det->panels[0].clen = 1.0; image.det->panels[0].res = 1.0; - image.det->panels[0].integr_radius = 10.0; image.det->panels[0].adu_per_eV = 1.0/1000.0; /* -> 1 adu per photon */ image.width = 128; |