Prepared for distribution.

Fixed lines in the Makefile that I hadn't changed when I copied it into
this project in the beginning.  Also added GPL blurbs to two py files.

diff --git a/Makefile b/Makefile
index 39baac2378452d756eadb50c2e54206c81a6ebf4..8514b7951538aaa37d46a9ed6c5af524b151f25c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,9 @@ check : all
 
 dist :
        python setup.py sdist
-       scp dist/data_logger*tar.gz einstein:public_html/code/python/
+       scp dist/calibcant*tar.gz einstein:public_html/code/python/
 
 clean :
        python setup.py clean
-       rm -rf build dist data_logger.egg-info
+       rm -rf build dist calibcant.egg-info
        rm -f dummy_py *.pyc

diff --git a/calibcant/calibrate.py b/calibcant/calibrate.py
index 2cfff35758eafd1cc3392c28eafe6fd15c74a286..10622f49b8a3df44035e1ff489cb65bdbf3c40a0 100755 (executable)
--- a/calibcant/calibrate.py
+++ b/calibcant/calibrate.py
@@ -1,4 +1,27 @@
 #!/usr/bin/python
+#
+# calibcant - tools for thermally calibrating AFM cantilevers
+#
+# Copyright (C) 2007,2008, William Trevor King
+#
+# This program 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.
+#
+# This program 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 this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+#
+# The author may be contacted at <wking@drexel.edu> on the Internet, or
+# write to Trevor King, Drexel University, Physics Dept., 3141 Chestnut St.,
+# Philadelphia PA 19104, USA.
 
 """
 Aquire and analyze cantilever calibration data.

diff --git a/calibcant/config.py b/calibcant/config.py
index f86618ef318e66c2d581859b2fde8f020656ffd8..8d7d51131a525536e4500d4003db17f62b1dd623 100644 (file)
--- a/calibcant/config.py
+++ b/calibcant/config.py
@@ -1,3 +1,26 @@
+# calibcant - tools for thermally calibrating AFM cantilevers
+#
+# Copyright (C) 2007,2008, William Trevor King
+#
+# This program 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.
+#
+# This program 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 this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+#
+# The author may be contacted at <wking@drexel.edu> on the Internet, or
+# write to Trevor King, Drexel University, Physics Dept., 3141 Chestnut St.,
+# Philadelphia PA 19104, USA.
+
 """Define some variables to configure the package for a particular lab
 and workflow."""