Changeset 463

Timestamp:

09/24/08 08:58:30 (2 months ago)

Author:

pierre

Message:

Some minors fixes in neuron2. I'm not really using it, but when i tried to run the benchmark, it seems to me that some minors troubles were here du to the Timer() and to some padding in the output file. Hope I'm right. Also, slight modification of the recording class to save dimensions, in the header, as a list and not as a string of int. It will be much more simple, for postprocessing of the header in NeuroTools

Files:

• trunk/src/neuron2/__init__.py (modified) (1 diff)
• trunk/src/neuron2/simulator.py (modified) (3 diffs)
• trunk/src/recording.py (modified) (2 diffs)

trunk/src/neuron2/__init__.py

@@ -733 +733 @@
-            f.write(line)
-        f.close()
+
+# ==============================================================================
+#   Utility classes
+# ==============================================================================
+
+Timer = common.Timer
+
+# ==============================================================================

trunk/src/neuron2/simulator.py

@@ -67 +67 @@
-    def get(self, gather=False):
-        """Returns the recorded data."""
-        if self.population:  # we return indices (always starting at 0), not IDs. This is what the other modules do, but I think we should really return IDs.
-            offset = self.population.first_id
-        else:
-            offset = 0
-        if self.variable == 'spikes':
-            data = numpy.empty((0,2))
@@ -77 +73 @@
-                spikes = spikes[spikes<=state.t+1e-9]
-                if len(spikes) > 0:
-(id-offset)
+id
-                    data = numpy.concatenate((data, new_data))
-        elif self.variable == 'v':
@@ -84 +80 @@
-                v = id._cell.vtrace.toarray()
-                t = id._cell.record_times.toarray()
-(id-offset)
+id
-                data = numpy.concatenate((data, new_data))
-        return data

trunk/src/recording.py

@@ -88 +88 @@
-    # Write header info (e.g., dimensions of the population)
-    if population is not None:
-" + "\t".join([str(d) for d in population.dim]) + "\n"
+ %s\n" %list(population.dim)
-        result.write("# first_id = %d\n" % population.first_id)
-        result.write("# last_id = %d\n" % (population.first_id+len(population)-1,))
@@ -149 +149 @@
-        if population is not None:
-            metadata.update({
-"\t".join([str(d) for d in population.dim]
+str(list(population.dim)
-                'first_id': population.first_id,
-                'last_id': population.first_id + len(population)-1