Merge branch 'master' into lfpy

Author: wvangeit

bluepyopt/ephys/morphologies.py

@@ -216,7 +216,7 @@ def replace_axon(sim=None, icell=None):
   } else if(nSec == 1) {
     axon[0] D1 = D2 = diam
   } else {
-    axon[0] D1 = diam
+    axon[0] D1 = D2 = diam
     soma distance() //to calculate distance from soma
     forsec axonal{
       //if section is longer than 60um then store diam and exit from loop