Changeset 1029
- Timestamp:
- 12/09/11 11:04:24 (6 months ago)
- Location:
- trunk/src
- Files:
-
- 2 modified
-
nemo/simulator.py (modified) (1 diff)
-
nest/recording.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/nemo/simulator.py
r1027 r1029 115 115 116 116 self._fired = self.sim.step(spikes, currents) 117 self.time += self. sim.elapsed_simulation()117 self.time += self.dt 118 118 119 119 if self.stdp: -
trunk/src/nest/recording.py
r1000 r1029 294 294 if not self._device._gathered: 295 295 filtered_ids = self.filter_recorded(filter) 296 mask = reduce(numpy.add, (data[:,0]==id for id in filtered_ids))297 296 if len(data) > 0: 297 mask = reduce(numpy.add, (data[:,0]==id for id in filtered_ids)) 298 298 data = data[mask] 299 299 return data
