Changeset 433 for branches

Timestamp:

08/28/09 22:47:46 (3 years ago)

Author:

lestebanez

Message:

spikes.py & analog.py : a better detection of numeric argument for 't_start' in the constructors of all Spike and Analog related objects

Location:

branches/interval/src

Files:

• nex/nex_wrapper.py (modified) (1 diff)
• signals/analogs.py (modified) (3 diffs)
• signals/intervals.py (modified) (1 diff)
• signals/spikes.py (modified) (3 diffs)

branches/interval/src/nex/nex_wrapper.py

@@ -145 +145 @@
   fragmentStarts = np.fromstring(bin_file.read(data['n']*4), np.int32)
   t0 = timestamps[0] - fragmentStarts[0]/float(data['WFrequency'])*1000.
-  output_dict['contvars'][data['name']] = AnalogSignal(np.fromstring(bin_file.read(data['NPointsWave']*2), np.int16)*data['ADtoMV'] + data['MVOffset'], 1/float(data['WFrequency']), t_start=t0);
+  output_dict['contvars'][data['name']] = AnalogSignal(np.fromstring(bin_file.read(data['NPointsWave']*2), np.int16)*data['ADtoMV'] + data['MVOffset'], 1/float(data['WFrequency']), t_start=t0)
   bin_file.seek(filePosition,0)      
 

branches/interval/src/signals/analogs.py

@@ -31 +31 @@
 """
 
-import os, re, numpy, copy, logging
+import os, re, numpy, copy, logging, operator
 from NeuroTools import check_dependency, check_numpy_version, analysis
 from NeuroTools.io import *
@@ -113 +113 @@
                 interval_out = Interval([[t_start, t_stop]])
             elif t_start is not None and t_stop is None:
-                if type(t_start) == float or type(t_start) == int:
+                if operator.isNumberType(t_start):
                     interval_out = Interval([[t_start, t_start + len(self.signal)*self.dt]])
                 else :
@@ -497 +497 @@
                 interval_out = Interval([[t_start, t_stop]])
             elif t_start is not None and t_stop is None:
-                if type(t_start) == float or type(t_start) == int:
+                if operator.isNumberType(t_start):
                     interval_out = Interval([[t_start, t_start + len(signal)*self.dt]])
                 else :

branches/interval/src/signals/intervals.py

@@ -39 +39 @@
             assert len(sub_intervals) == 1, "Interval package not present, interval must be (t_start, t_stop) !"
         for item in sub_intervals:
+
             assert (len(item) == 2), "Intervals must be a list of tuple (t_start, t_stop) !"
             assert item[1] >= item[0], "Intervals must have tuple with t_start < t_stop !"

branches/interval/src/signals/spikes.py

@@ -25 +25 @@
 """
 
-import os, re, numpy, copy, logging
+import os, re, numpy, copy, logging, operator
 from NeuroTools import check_dependency, check_numpy_version, analysis
 from NeuroTools.io import *
@@ -140 +140 @@
                 interval_out = Interval([[t_start, t_stop]])
             elif t_start is not None and t_stop is None:
-                if type(t_start) == float or type(t_start) == int:
+                if operator.isNumberType(t_start):
                     try:
                         t_stop  = numpy.max(self.spike_times)
@@ -909 +909 @@
                 interval_out = Interval([[t_start, t_stop]])
             elif t_start is not None and t_stop is None:
-                if type(t_start) == float or type(t_start) == int :
+                if operator.isNumberType(t_start):
                     try:
                         stop_times = numpy.array([self.spiketrains[idx].t_stop for idx in self.id_list()])