Skip to content

Commit

Permalink
Solve merge conflict in monitors - again
Browse files Browse the repository at this point in the history
  • Loading branch information
liadomide committed Jun 21, 2016
1 parent 9a18d98 commit 9e0aa2d
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions tvb/simulator/monitors.py
Original file line number Diff line number Diff line change
Expand Up @@ -444,9 +444,6 @@ def config_for_sim(self, simulator):

# handle region vs simulation, analytic vs numerical proj, cortical vs subcortical.

if hasattr(self, 'sensors'):
self.sensors.configure()

# setup convenient locals
surf = simulator.surface
conn = simulator.connectivity
Expand Down Expand Up @@ -918,4 +915,4 @@ def record(self, step, state):
except:
self._last_step = step
if (step - self._last_step) % self._istep == 0:
self.logger.info('step %d time %.4f s', step, step * self._dt / 1e3)
self.logger.info('step %d time %.4f s', step, step * self._dt / 1e3)

0 comments on commit 9e0aa2d

Please sign in to comment.