ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/osprai/osprai/trunk/io_module.py
(Generate patch)
# Line 23 | Line 23
23    >>> io.writesprit(ba3, "newspritfile.txt")
24    >>> io.writeclamp(ba3, "newclampfile.txt")
25   """
26 < __version__ = "110207"
26 > __version__ = "110208"
27  
28  
29   ## Import libraries.
# Line 215 | Line 215
215      
216      ## Determine experiment start time so we can make other times relative.
217      x = txtfile[0].split("\t")  ## E.g. "03/05/2010 13:37:20.218"
218 <    t0 = icmtime2sec(x[0])      ## E.g. 1267825040.22
218 >    t0 = __icmtime2sec(x[0])      ## E.g. 1267825040.22
219      
220      ## Move the data from txtfile to ba0.
221      for i, txtline in enumerate(txtfile):
222          x = txtline.split("\t")
223 <        tx = icmtime2sec(x[0]) - t0
223 >        tx = __icmtime2sec(x[0]) - t0
224          for j in range(1,rois):
225              ba0.roi[j].time[i] = tx
226              ba0.roi[j].value[i] = float(x[j])
# Line 229 | Line 229
229      """End of readicmtxt"""
230  
231  
232 < def icmtime2sec(timetxt):
232 > def __icmtime2sec(timetxt):
233      """
234      Take a time of the form "03/05/2010 15:19:27.312" and return seconds.
235      """
# Line 238 | Line 238
238      hh, min, ss = clock.split(":")
239      stime = (int(yy), int(mm), int(dd), int(hh), int(min), 0, 0, 0, 0)
240      return mktime(stime) + float(ss)
241 <    """End of icmtime2sec"""
241 >    """End of __icmtime2sec"""
242      
243      
244   def readbiosensor(fname):

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines