Use moose.element to get the element.

Author: Dilawar Singh

squid/squid.py

@@ -28,8 +28,6 @@
 
 # Code:
 import sys
-sys.path.append('../../python')
-
 import numpy
 import moose
 
@@ -99,22 +97,24 @@ def setupAlpha(self, gate, params, vdivs, vmin, vmax):
     def alpha_m(self):
         if self.Xpower == 0:
             return numpy.array([])        
-        return numpy.array(moose.HHGate('%s/gateX' % (self.path)).tableA)
+        return numpy.array(moose.element('%s/gateX' % (self.path)).tableA)
     @property
     def beta_m(self):
         if self.Xpower == 0:
             return numpy.array([])        
-        return numpy.array(moose.HHGate('%s/gateX' % (self.path)).tableB) - numpy.array(moose.HHGate('%s/gateX' % (self.path)).tableA)
+        return numpy.array(moose.element('%s/gateX' % (self.path)).tableB) - \
+                numpy.array(moose.element('%s/gateX' % (self.path)).tableA)
     @property
     def alpha_h(self):
         if self.Ypower == 0:
             return numpy.array([])        
-        return numpy.array(moose.HHGate('%s/gateY' % (self.path)).tableA)
+        return numpy.array(moose.element('%s/gateY' % (self.path)).tableA)
     @property
     def beta_h(self):
         if self.Ypower == 0:
             return numpy.array([])        
-        return numpy.array(moose.HHGate('%s/gateY' % (self.path)).tableB) - numpy.array(moose.HHGate('%s/gateY' % (self.path)).tableA)
+        return numpy.array(moose.element('%s/gateY' % (self.path)).tableB) \
+                - numpy.array(moose.element('%s/gateY' % (self.path)).tableA)
 
 class SquidAxon(moose.Compartment):
     EREST_ACT = 0.0 # can be -70 mV if not following original HH convention

squid/test_squid.py

@@ -30,6 +30,7 @@
 
 import unittest
 import pylab
+import numpy
 from squid import SquidModel
 
 class SquidAxonTest(unittest.TestCase):
@@ -112,6 +113,5 @@ def test_K_beta_m(self):
         self.assertLessEqual(difference, numpy.mean(beta_m)*1e-6)
 
 
-
 # 
 # test_squid.py ends here