From 78e101f9a36b7e8a78a71e9e353317e2077067c6 Mon Sep 17 00:00:00 2001 From: maedoc Date: Wed, 17 Jun 2015 23:40:32 +0200 Subject: [PATCH 1/8] don't forget to configure sensors --- tvb/simulator/monitors.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tvb/simulator/monitors.py b/tvb/simulator/monitors.py index 931ce0c35..ef1e34b58 100644 --- a/tvb/simulator/monitors.py +++ b/tvb/simulator/monitors.py @@ -444,6 +444,9 @@ 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 @@ -915,4 +918,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) \ No newline at end of file + self.logger.info('step %d time %.4f s', step, step * self._dt / 1e3) From 118b1c4be6347620183ff8da5c4d17dac3ec2ac0 Mon Sep 17 00:00:00 2001 From: maedoc Date: Wed, 17 Jun 2015 23:40:32 +0200 Subject: [PATCH 2/8] don't forget to configure sensors --- tvb/simulator/monitors.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tvb/simulator/monitors.py b/tvb/simulator/monitors.py index ef1e34b58..f3a13a7bb 100644 --- a/tvb/simulator/monitors.py +++ b/tvb/simulator/monitors.py @@ -444,6 +444,9 @@ def config_for_sim(self, simulator): # handle region vs simulation, analytic vs numerical proj, cortical vs subcortical. + if hasattr(self, 'sensors'): + self.sensors.configure() + if hasattr(self, 'sensors'): self.sensors.configure() From 0b935c8bbc80bfcb462d1d2988ea4a90fc1282bb Mon Sep 17 00:00:00 2001 From: maedoc Date: Wed, 17 Jun 2015 23:40:32 +0200 Subject: [PATCH 3/8] don't forget to configure sensors --- tvb/simulator/monitors.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tvb/simulator/monitors.py b/tvb/simulator/monitors.py index f3a13a7bb..82e32bace 100644 --- a/tvb/simulator/monitors.py +++ b/tvb/simulator/monitors.py @@ -450,6 +450,9 @@ def config_for_sim(self, simulator): if hasattr(self, 'sensors'): self.sensors.configure() + if hasattr(self, 'sensors'): + self.sensors.configure() + # setup convenient locals surf = simulator.surface conn = simulator.connectivity From 9773bbf56acb8e83b35f4e31d75f069ffb116d80 Mon Sep 17 00:00:00 2001 From: Lia Domide Date: Wed, 9 Sep 2015 08:49:59 +0300 Subject: [PATCH 4/8] Solve merge conflict - bis --- tvb/simulator/monitors.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tvb/simulator/monitors.py b/tvb/simulator/monitors.py index 82e32bace..ef1e34b58 100644 --- a/tvb/simulator/monitors.py +++ b/tvb/simulator/monitors.py @@ -444,12 +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() - - if hasattr(self, 'sensors'): - self.sensors.configure() - if hasattr(self, 'sensors'): self.sensors.configure() From b3b557cf4ba0dd27245678a6d3cefc7691087011 Mon Sep 17 00:00:00 2001 From: maedoc Date: Wed, 17 Jun 2015 23:40:32 +0200 Subject: [PATCH 5/8] don't forget to configure sensors --- tvb/simulator/monitors.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tvb/simulator/monitors.py b/tvb/simulator/monitors.py index ef1e34b58..f3a13a7bb 100644 --- a/tvb/simulator/monitors.py +++ b/tvb/simulator/monitors.py @@ -444,6 +444,9 @@ def config_for_sim(self, simulator): # handle region vs simulation, analytic vs numerical proj, cortical vs subcortical. + if hasattr(self, 'sensors'): + self.sensors.configure() + if hasattr(self, 'sensors'): self.sensors.configure() From d0e4a049e6a59ce7b2758dd3bf46df53dbb5a128 Mon Sep 17 00:00:00 2001 From: maedoc Date: Wed, 17 Jun 2015 23:40:32 +0200 Subject: [PATCH 6/8] don't forget to configure sensors --- tvb/simulator/monitors.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tvb/simulator/monitors.py b/tvb/simulator/monitors.py index f3a13a7bb..82e32bace 100644 --- a/tvb/simulator/monitors.py +++ b/tvb/simulator/monitors.py @@ -450,6 +450,9 @@ def config_for_sim(self, simulator): if hasattr(self, 'sensors'): self.sensors.configure() + if hasattr(self, 'sensors'): + self.sensors.configure() + # setup convenient locals surf = simulator.surface conn = simulator.connectivity From 9a18d984dd268357e550bc23b1931521db692c40 Mon Sep 17 00:00:00 2001 From: Lia Domide Date: Wed, 9 Sep 2015 08:49:59 +0300 Subject: [PATCH 7/8] Solve merge conflict - bis --- tvb/simulator/monitors.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tvb/simulator/monitors.py b/tvb/simulator/monitors.py index 82e32bace..ef1e34b58 100644 --- a/tvb/simulator/monitors.py +++ b/tvb/simulator/monitors.py @@ -444,12 +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() - - if hasattr(self, 'sensors'): - self.sensors.configure() - if hasattr(self, 'sensors'): self.sensors.configure() From 9e0aa2df251ba494e8a51aa0de8a461f9d28b0d1 Mon Sep 17 00:00:00 2001 From: Lia Domide Date: Tue, 21 Jun 2016 09:09:49 +0300 Subject: [PATCH 8/8] Solve merge conflict in monitors - again --- tvb/simulator/monitors.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tvb/simulator/monitors.py b/tvb/simulator/monitors.py index ef1e34b58..931ce0c35 100644 --- a/tvb/simulator/monitors.py +++ b/tvb/simulator/monitors.py @@ -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 @@ -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) \ No newline at end of file