allow to use '&' and the distance twice in hoc distribution

Author: Jaquier Aurélien Tristan

bluepyopt/ephys/create_hoc.py

@@ -105,6 +105,7 @@ def range_exprs_to_hoc(range_params):
     for param in range_params:
         value = param.value_scaler.inst_distribution
         value = re.sub(r'math\.', '', value)
+        value = re.sub(r'\&', '&&', value)
         value = re.sub('{distance}', FLOAT_FORMAT, value)
         value = re.sub('{value}', format_float(param.value), value)
         ret.append(Range(param.location, param.name, value))

bluepyopt/ephys/templates/cell_template.jinja2

@@ -120,7 +120,7 @@ proc distribute_distance(){local x localobj sl
   this.soma[0] distance(0, 0.5)
   sprint(distfunc, "%%s %s(%%f) = %s", mech, distfunc)
   forsec sl for(x, 0) {
-    sprint(stmp, distfunc, secname(), x, distance(x))
+    sprint(stmp, distfunc, secname(), x, distance(x), distance(x))
     execute(stmp)
   }
 }