Changeset 165 for branches

Timestamp:

05/07/08 17:56:33 (4 years ago)

Author:

LaurentPerrinet

Message:

CodeJam? #2: clean-up of the NeuroTools package / removing benchmark.py and everything that depends on it (if you need it, find it in branches/working_concept2) / examples on single neuron are fine, still some work to do on retina

Files:

• branches/packaged_tools/NeuroTools/h5howto.py (modified) (1 diff)

branches/packaged_tools/NeuroTools/h5howto.py

@@ -10 +10 @@
 
 import sys
+<<<<<<< .mine
+sys.path.append('/Users/lup/sci/neuralensemble/NeuroTools/branches/packaged_tools')
+=======
 sys.path.append('/home/thierry/NeuroTools_Project')
+>>>>>>> .r164
 from NeuroTools.HDF5Tools.HDF5Factory.highlevel import openH5File, HDF5File
 from NeuroTools.PythonObjects.spikes import SpikeTrain, SpikeList