diff options
| author | Thomas White <taw@physics.org> | 2013-03-21 12:20:47 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2013-03-21 12:20:47 +0100 |
| commit | c88c59d6239d3f631964f9a1f541ce9a78ffdc7e (patch) | |
| tree | 0e4c4395cb6014c46ff3b8368e6aef814b976dde | |
| parent | 5586bde15ca4b023816f37b53c6d173c1ab50b7b (diff) | |
| parent | ef7d9bbfc1242221b5270e960c7b68b4964c6d87 (diff) | |
Merge branch 'master' of ssh://git.bitwiz.org.uk/crystfel
| -rw-r--r-- | libcrystfel/src/detector.c | 2 | ||||
| -rw-r--r-- | src/dw-hdfsee.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c index 41ebcc9a..37328e5f 100644 --- a/libcrystfel/src/detector.c +++ b/libcrystfel/src/detector.c @@ -365,7 +365,7 @@ void record_image(struct image *image, int do_poisson) ys = (x-p->min_fs)*p->fsy + (y-p->min_ss)*p->ssy; rx = (xs + p->cnx) / p->res; ry = (ys + p->cny) / p->res; - dsq = sqrt(pow(rx, 2.0) + pow(ry, 2.0)); + dsq = pow(rx, 2.0) + pow(ry, 2.0); /* Projected area of pixel divided by distance squared */ sa = proj_area / (dsq + Lsq); diff --git a/src/dw-hdfsee.c b/src/dw-hdfsee.c index ec90b87e..a4101eb0 100644 --- a/src/dw-hdfsee.c +++ b/src/dw-hdfsee.c @@ -3,12 +3,12 @@ * * Quick yet non-crappy HDF viewer * - * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, - * a research centre of the Helmholtz Association. + * Copyright © 2012-2013 Deutsches Elektronen-Synchrotron DESY, + * a research centre of the Helmholtz Association. * Copyright © 2012 Richard Kirian * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2009-2013 Thomas White <taw@physics.org> * 2012 Richard Kirian * * This file is part of CrystFEL. @@ -957,13 +957,13 @@ static gint displaywindow_about(GtkWidget *widget, DisplayWindow *dw) gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(window), "hdfsee"); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(window), PACKAGE_VERSION); gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(window), - "(c) 2006-2011 Thomas White <taw@physics.org> and others"); + "(c) 2012-2013 Thomas White <taw@physics.org> and others"); gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(window), "Quick viewer for HDF files"); gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(window), - "(c) 2006-2011 Thomas White <taw@physics.org>\n"); + "(c) 2012-2013 Thomas White <taw@physics.org>\n"); gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(window), - "http://www.bitwiz.org.uk/"); + "http://www.desy.de/~twhite/crystfel"); gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(window), authors); g_signal_connect(window, "response", G_CALLBACK(gtk_widget_destroy), |