Changeset 458

Timestamp:

09/10/08 15:20:11 (2 months ago)

Author:

apdavison

Message:

In nest2, defer creating the NEST recording device (in the Recorder class) until the first time Recorder.record() is called.

Files:

• trunk/src/__init__.py (modified) (1 diff)
• trunk/src/nest2/__init__.py (modified) (5 diffs)

trunk/src/__init__.py

@@ -2 +2 @@
-__all__ = ["common", "random", "nest1", "nest2", "neuron", "neuron2", "pcsim", 'brian' ]
-
-#

trunk/src/nest2/__init__.py

@@ -116 +116 @@
-        self.population = population # needed for writing header information
-        self.recorded = Set([])        
-
-
+
+
+
+
+
-        self._device = nest.Create(device_name)
-
-
+
-        if self.variable != 'spikes':
-            device_parameters["interval"] = get_time_step()
-
+self.
-            device_parameters.update(to_file=False, to_memory=True)
+        else: # (includes self.file is None)
+            device_parameters.update(to_file=True, to_memory=False)
-        # line needed for old version of nest 2.0
-       
+        
-        nest.SetStatus(self._device, device_parameters)
-
-    def record(self, ids):
-        """Add the cells in `ids` to the set of recorded cells."""
+        if self._device is None:
+            self._create_device()
-        ids = Set(ids)
-        new_ids = list( ids.difference(self.recorded) )
@@ -150 +156 @@
-    def get(self, gather=False):
-        """Returns the recorded data."""
+        if self._device is None:
+            raise Exception("No cells recorded, so no data to return")
-        if nest.GetStatus(self._device, 'to_file')[0]:
-            nest_filename = _merge_files(self._device, gather)
@@ -167 +175 @@
-    
-    def write(self, file=None, gather=False, compatible_output=True):
+        if self._device is None:
+            raise Exception("No cells recorded, so no data to write to file.")
-        user_file = file or self.file
-        if isinstance(user_file, basestring):
@@ -811 +821 @@
-
-    def _record(self, variable, record_from=None, rng=None,to_file=True):
-        if to_file is False:
-            nest.SetStatus(self.recorders[variable]._device, {'to_file': False, 'to_memory': True})
-
-        # create list of neurons
-        fixed_list = False
@@ -839 +846 @@
-                rng = numpy.random
-            tmp_list = rng.permutation(numpy.reshape(self.cell, (self.cell.size,)))[0:n_rec]
-
+
-        self.recorders[variable].record(tmp_list)
+        nest.SetStatus(self.recorders[variable]._device, {'to_file': to_file, 'to_memory': not to_file})
-
-    def record(self, record_from=None, rng=None, to_file=True):