Changeset 1031 for branches

Timestamp:

12/13/11 15:58:05 (5 months ago)

Author:

apdavison

Message:

In neo_output branch, we now use AnalogSignalArrays (one per variable) rather than lists of individual AnalogSignals

Location:

branches/neo_output

Files:

• examples/neo_example.py (added)
• src/nest/recording.py (modified) (1 diff)
• src/neuron/recording.py (modified) (1 diff)

branches/neo_output/src/nest/recording.py

@@ -420 +420 @@
                     for id in self.filter_recorded('spikes', filter_ids)]
             else:
-                data = self._multimeter.get_data(variable,
-                                                 self.filter_recorded(variable, filter_ids))
-                segment.analogsignals.extend(
-                    neo.AnalogSignal(data[id],
-                                     units=recording.UNITS_MAP.get(variable, 'dimensionless'),
-                                     t_start=simulator.state.t_start*pq.ms,
-                                     sampling_period=simulator.state.dt*pq.ms,
-                                     name=variable,
-                                     source_population=self.population.label,
-                                     source_id=int(id))
-                    for id in self.filter_recorded(variable, filter_ids))
+                ids = self.filter_recorded(variable, filter_ids)
+                data = self._multimeter.get_data(variable, ids)
+                segment.analogsignalarrays.append(
+                    neo.AnalogSignalArray(
+                        data.T,
+                        units=recording.UNITS_MAP.get(variable, 'dimensionless'),
+                        t_start=simulator.state.t_start*pq.ms,
+                        sampling_period=simulator.state.dt*pq.ms,
+                        name=variable,
+                        source_population=self.population.label,
+                        source_ids=numpy.fromiter(ids, dtype=int))
+                )
         return segment
 

branches/neo_output/src/neuron/recording.py

@@ -145 +145 @@
                 else:
                     get_signal = lambda id: id._cell.traces[variable]
-                segment.analogsignals.extend(
-                    neo.AnalogSignal(get_signal(id), # assuming not using cvode, otherwise need to use IrregularlySampledAnalogSignal
-                                     units=recording.UNITS_MAP.get(variable, 'dimensionless'),
-                                     t_start=simulator.state.t_start*pq.ms,
-                                     sampling_period=simulator.state.dt*pq.ms,
-                                     name=variable,
-                                     source_population=self.population.label,
-                                     source_id=int(id))
-                    for id in self.filter_recorded(variable, filter_ids))
-                assert segment.analogsignals[0].t_stop - simulator.state.t*pq.ms < 2*simulator.state.dt*pq.ms
-                # need to add `Unit` and `RecordingChannel` objects
+                ids = self.filter_recorded(variable, filter_ids)
+                signal_array = numpy.vstack((get_signal(id) for id in ids))
+                segment.analogsignalarrays.append(
+                    neo.AnalogSignalArray(
+                        signal_array.T, # assuming not using cvode, otherwise need to use IrregularlySampledAnalogSignal
+                        units=recording.UNITS_MAP.get(variable, 'dimensionless'),
+                        t_start=simulator.state.t_start*pq.ms,
+                        sampling_period=simulator.state.dt*pq.ms,
+                        name=variable,
+                        source_population=self.population.label,
+                        source_ids=numpy.fromiter(ids, dtype=int))
+                )
+                assert segment.analogsignalarrays[0].t_stop - simulator.state.t*pq.ms < 2*simulator.state.dt*pq.ms
+                # need to add `Unit` and `RecordingChannelGroup` objects
         return segment