Merge pull request #296 from alexevag/patch-1

Check that in inter-trial period mouse is not in Proximity Port

Behaviors/MultiPort.py

@@ -49,6 +49,9 @@ def is_correct(self):
         return self.curr_cond['response_port'] == -1 or \
                np.any(np.equal(self.response.port, self.curr_cond['response_port']))
 
+    def is_off_proximity(self):
+        return self.interface.off_proximity()
+
     def reward(self, tmst=0):
         if self.response.reward: tmst=0 # if response and reward ports are the same no need of tmst 
         licked_port = self.is_licking(since=tmst, reward=True)

Experiments/MatchToSample.py

@@ -254,7 +254,7 @@ def next(self):
             return 'Hydrate'
         elif self.beh.is_sleep_time() or self.beh.is_hydrated():
             return 'Offtime'
-        elif self.state_timer.elapsed_time() >= self.curr_cond['intertrial_duration']:
+        elif self.state_timer.elapsed_time() >= self.curr_cond['intertrial_duration'] and self.beh.is_off_proximity():
             return 'PreTrial'
         else:
             return 'InterTrial'

Interfaces/RPPorts.py

@@ -113,6 +113,9 @@ def in_position(self, port=0):
         position_dur = self.timer_ready.elapsed_time() if self.position else self.position_dur
         return self.position, position_dur, self.position_tmst
 
+    def off_proximity(self):
+        return self.position.type != 'Proximity'
+
     def _get_position(self, ports=0):
         if not ports: ports = self.proximity_ports
         elif not type(ports) is list: ports = [ports]