Merge pull request #27 from irahulsonkar/master

Updated default injection current

Author: pgleeson

Tutorial/Source/HodgkinHuxley.py

@@ -120,13 +120,8 @@ def I_inj(self, t):
             return 10*(t>100) - 10*(t>200) + 35*(t>300) - 35*(t>400)
 
         #""" running jupyterLab notebook """
-        #injection current is defined
-        elif self.I_inj_width>0:              
-            return self.I_inj_max*(t>self.I_inj_trans) - self.I_inj_max*(t>self.I_inj_trans+self.I_inj_width)
-        
-        #default injection current
         else:
-            return 10*(t>150) - 10*(t>300)
+            return self.I_inj_max*(t>self.I_inj_trans) - self.I_inj_max*(t>self.I_inj_trans+self.I_inj_width)
 
     @staticmethod
     def dALLdt(X, t, self):

notebook/notebook.ipynb

@@ -48,13 +48,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "5642c47f493c4f08bcd11f959297b0c6",
+       "model_id": "1d3c73d3138d47af8f717354d52f302c",
        "version_major": 2,
        "version_minor": 0
       },
@@ -68,7 +68,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "6521d11af86947c8b2c9fef49c7d6201",
+       "model_id": "814554308e89435dac419867021cf088",
        "version_major": 2,
        "version_minor": 0
       },

notebook/ui_widget.py

@@ -12,11 +12,11 @@
 default_pot_K        = -77
 default_pot_L        = -54.387
 default_t0           = 0
-default_tn           = 450
+default_tn           = 150
 default_deltat       = 0.01
-default_amplitude    = 50
-default_width        = 0
-default_translation  = 50
+default_amplitude    = 10
+default_width        = 100
+default_translation  = 25
 
 #function to reset input values to default on button click
 def resetTodefault(_):
@@ -42,13 +42,14 @@ def showDefault(response):
 
 #function to change slider handle colour when move from default
 def highlight_slider():
-    inputList    = [slider_capacitance, slider_cond_Na, slider_cond_K, slider_cond_L, slider_pot_Na, slider_pot_K, slider_pot_L]
-    inputDefault = [default_capacitance, default_cond_Na, default_cond_K, default_cond_L, default_pot_Na, default_pot_K, default_pot_L]
+    inputList    = [slider_capacitance, slider_cond_Na, slider_cond_K, slider_cond_L, slider_pot_Na, slider_pot_K, slider_pot_L, slider_amplitude, slider_width, slider_translation]
+    inputDefault = [default_capacitance, default_cond_Na, default_cond_K, default_cond_L, default_pot_Na, default_pot_K, default_pot_L, default_amplitude, default_width, default_translation]
     for l, d in zip(inputList,inputDefault):
         if l.value == d:
             l.style.handle_color = 'white'
         else:
             l.style.handle_color = 'orange'
+    """
     if slider_width.value == default_width:
         slider_amplitude.style.handle_color = 'white'
         slider_width.style.handle_color = 'white'
@@ -57,6 +58,7 @@ def highlight_slider():
         slider_amplitude.style.handle_color = 'orange'
         slider_width.style.handle_color = 'orange'
         slider_translation.style.handle_color = 'orange'
+    """
 
 #defining the widgets
 #Header or texts as HTMLMath to include symbols
@@ -80,9 +82,9 @@ def highlight_slider():
 slider_translation = ipywidgets.FloatSlider(value=default_translation,min=0,max=250,step=0.1,description='Time Delay',readout=False,continuous_update=False)
 
 #text box widgets
-time_start         = ipywidgets.FloatText(value=0,description='Start Time',disabled=True)
-time_end           = ipywidgets.FloatText(value=450,description='Total Time',disabled=False)
-time_step          = ipywidgets.FloatText(value=0.01,description='Time Step',disabled=False)
+time_start         = ipywidgets.FloatText(value=default_t0,description='Start Time',disabled=True)
+time_end           = ipywidgets.FloatText(value=default_tn,description='Total Time',disabled=False)
+time_step          = ipywidgets.FloatText(value=default_deltat,description='Time Step',disabled=False)
 
 #text box widgets to link with sliders (included to type in values for slider inputs also)
 textBox_capacitance = ipywidgets.FloatText(value=default_capacitance,step=0.1,layout=ipywidgets.Layout(width='5%'))