Ran update-copyright.py

[hooke.git] / hooke / driver / mfp1dexport.py

diff --git a/hooke/driver/mfp1dexport.py b/hooke/driver/mfp1dexport.py
index 3f1dbab8ffc03dfc79db33ea18232ffdf48a5e77..efacd187763cefe61d455178ea253e34688749b7 100644 (file)
--- a/hooke/driver/mfp1dexport.py
+++ b/hooke/driver/mfp1dexport.py
@@ -1,15 +1,29 @@
-'''
-mfp1dexport.py
-
-Driver for text-exported MFP 1D files
-
-Massimo Sandal (c) 2009
-'''
+# Copyright (C) 2009-2012 Massimo Sandal <devicerandom@gmail.com>
+#                         W. Trevor King <wking@tremily.us>
+#
+# This file is part of Hooke.
+#
+# Hooke is free software: you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# Hooke 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 Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Hooke.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Driver for text-exported MFP 1D files
+"""
 
 import os
+import os.path
 
 from .. import libhooke as lh
-from .. import libhookecurve as lhc
+from .. import curve as lhc
 
 
 __version__='0.0.0.20090923'
@@ -27,13 +41,12 @@ class mfp1dexportDriver(lhc.Driver):
         self.lines = list(self.filedata.readlines())
         self.filedata.close()
 
-        self.filetype='mfp1dexport'
-        self.experiment='smfs'
-
     def close_all(self):
         self.filedata.close()
 
     def is_me(self):
+        if os.path.isdir(path):
+            return False
         try:
             self.raw_header = self.lines[0:38]
         except: