Merge pull request #1 from dysplaced/master

Tickets #58, #59
NeuralEnsemble · Jun 15, 2012 · 9bd849d · 9bd849d
2 parents e08ee50 + 8577b48
commit 9bd849d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/neo/core/analogsignal.py b/neo/core/analogsignal.py
@@ -172,10 +172,10 @@ def rescale(self, units):
             to_u = self.units
             signal = np.array(self)
         else:
-            to_u = Quantity(1.0, to_dims)
-            from_u = Quantity(1.0, self.dimensionality)
+            to_u = pq.Quantity(1.0, to_dims)
+            from_u = pq.Quantity(1.0, self.dimensionality)
             try:
-                cf = get_conversion_factor(from_u, to_u)
+                cf = pq.quantity.get_conversion_factor(from_u, to_u)
             except AssertionError:
                 raise ValueError(
                     'Unable to convert between units of "%s" and "%s"'

diff --git a/neo/core/block.py b/neo/core/block.py
@@ -59,10 +59,9 @@ def list_units(self):
         """
         units = [ ]
         for rcg in self.recordingchannelgroups:
-            for rc in rcg.recordingchannel:
-                for unit in rc.units:
-                    if unit not in units:
-                        units.append(unit)
+            for unit in rcg.units:
+                if unit not in units:
+                    units.append(unit)
         return units
 
     @property
@@ -72,7 +71,7 @@ def list_recordingchannels(self):
         """
         all_rc = [ ]
         for rcg in self.recordingchannelgroups:
-            for rc in rcg.recordingchannel:
+            for rc in rcg.recordingchannels:
                 if rc not in all_rc:
                     all_rc.append(rc)
         return all_rc

diff --git a/neo/core/spiketrain.py b/neo/core/spiketrain.py
@@ -194,10 +194,10 @@ def rescale(self, units):
             to_u = self.units
             spikes = numpy.array(self)
         else:
-            to_u = Quantity(1.0, to_dims)
-            from_u = Quantity(1.0, self.dimensionality)
+            to_u = pq.Quantity(1.0, to_dims)
+            from_u = pq.Quantity(1.0, self.dimensionality)
             try:
-                cf = get_conversion_factor(from_u, to_u)
+                cf = pq.quantity.get_conversion_factor(from_u, to_u)
             except AssertionError:
                 raise ValueError(
                     'Unable to convert between units of "%s" and "%s"'