Merge branch 'trunk' of https://github.com/the-virtual-brain/tvb-library into trunk

Author: liadomide

tvb/datatypes/equations_scientific.py

@@ -168,10 +168,10 @@ def _set_pattern(self, var):
         # rolling in the deep ...  
         onset = self.parameters["onset"]
         off = var < onset
-        var = numpy.roll(var, int(off.sum() + 1))
-        var[:, 0:off.sum()] = 0.0
+        var = numpy.roll(var, off.sum() + 1)
+        var[..., off] = 0.0
         self._pattern = numexpr.evaluate(self.equation, global_dict=self.parameters)
-        self._pattern[:, 0:off.sum()] = 0.0
+        self._pattern[..., off] = 0.0
 
 
     pattern = property(fget=_get_pattern, fset=_set_pattern)