from brian.stdunits import *
from brian.units import *

F = 1
N_SUBPOP = 1

PARAMETERS = {
'Common':
    {'simu_dt'    : 0.05*msecond,
    'simu_length' : 2000*msecond,
    'N_subpop'    : N_SUBPOP,
    'N_mitral'    : N_SUBPOP*100*F,
    'inter_conn_rate'     : {},
    'inter_conn_strength' : {},
    },
'Input':
    {'tau_Ein'  : 3*msecond,
    'g_Ein0'    : 1*siemens*meter**-2,
    'sigma_Ein' : 0.3*siemens*meter**-2
    },
'InputOscillation':
    {'f'    : 2*Hz,
    'C'    : 1  # Must be set to 1 for oscillation
    },
'Mitral':
    {'C_m'      : 0.08*farad*meter**-2,
    'g_L'       : 0.87*siemens*meter**-2,
    'E_L'       : -64.5*mvolt,
    'V_r'       : -74*mvolt,
    'V_t'       : -62*mvolt,
    't_refract' : 0.2*msecond
    },
'Granule':
    {'C_m' : 0.01*farad*meter**-2,
    'g_L'  : 0.83*siemens*meter**-2,
    'E_L'  : -70*mvolt,
    'g_SD' : 1*siemens*meter**-2,
    'g_DS' : 300*siemens*meter**-2
    },
'Synapse':
    {'V_E'     : 0*mvolt,
    'V_act_E'  : 0*mvolt,
    'g_E'      : 0.7*siemens*meter**-2/F,
    'sigma_E'  : 0.01*mvolt,
    'alpha_E'  : 10*msecond**-1,
    'beta_E'   : 1./3*msecond**-1,

    'V_I'      : -80*mvolt,
    'V_act_I'  : -66.4*mvolt,
    'g_I'      : 10*siemens*meter**-2,
    'sigma_I'  : 0.4*mvolt,
    'alpha_I'  : 5*msecond**-1,
    'beta_I'   : 1./10*msecond**-1
    },
}

@@ -66,17 +66,55 @@
 UBPOP = 
-1
+2%0AINTERCO_RATE = 0%0AINTERCO_STRENGTH = 0
 %0A%0APARAME
@@ -259,18 +259,17 @@
 _SUBPOP*
-10
+5
 0*F,%0A   
@@ -298,42 +298,191 @@
  : %7B
-%7D,%0A    'inter_conn_strength' : %7B%7D,
+0: %7B1: INTERCO_RATE%7D,%0A                             1: %7B0: INTERCO_RATE%7D%7D,%0A    'inter_conn_strength' : %7B0: %7B1: INTERCO_STRENGTH%7D,%0A                             1: %7B0: INTERCO_STRENGTH%7D%7D
 %0A   

Change gamma pset to match beta simulation pset