Merged Rolf Schmidt's illysam branch

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

diff --git a/drivers/mcs.py b/hooke/driver/mcs.py
similarity index 92%
rename from drivers/mcs.py
rename to hooke/driver/mcs.py
index df12df640b6deb09423ef89d3ab514eb566f9265..f8208c04aea545dbfe482eeec35ff48e68feada7 100644 (file)
--- a/drivers/mcs.py
+++ b/hooke/driver/mcs.py
@@ -1,15 +1,7 @@
-#!/usr/bin/env python
+# Copyright

 
 

-'''
-mcs.py
-
-Driver for mcs fluorescence files.
-
-Copyright 2009 by Massimo Sandal, Allen Chen
-with modifications by Dr. Rolf Schmidt (Concordia University, Canada)
-
-This program is released under the GNU General Public License version 2.
-'''
+"""Driver for mcs fluorescence files.
+"""

 
 import os.path
 
 
 import os.path
 


@@ -104,4 +96,4 @@ class mcsDriver(lib.driver.Driver):
         for j in range(0,intervalsperfile): #read in all intervals in file
             temp=raw_data[256+j*4:256+j*4+4]    #data starts at byte offset 256
             real_data.append(struct.unpack('i', temp)[0]) #[0] because it returns a 1-element tuple
         for j in range(0,intervalsperfile): #read in all intervals in file
             temp=raw_data[256+j*4:256+j*4+4]    #data starts at byte offset 256
             real_data.append(struct.unpack('i', temp)[0]) #[0] because it returns a 1-element tuple

-        return real_data
\ No newline at end of file
+        return real_data