Merge pull request #301 from alexevag/patch-2

Instead of Offtime go to InterTrial to check if it is hydrated
ef-lab · Jul 12, 2022 · 80ab340 · 80ab340
2 parents 07da96d + 2b32bd9
commit 80ab340
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/Experiments/MatchPort.py b/Experiments/MatchPort.py
@@ -80,7 +80,7 @@ def next(self):
         if self.is_stopped():
             return 'Exit'
         elif self.beh.is_sleep_time():
-            return 'Offtime'
+            return 'InterTrial'
         elif self.resp_ready:
             return 'Trial'
         else:

diff --git a/Experiments/MatchToSample.py b/Experiments/MatchToSample.py
@@ -89,7 +89,7 @@ def next(self):
         if self.is_stopped():
             return 'Exit'
         elif self.beh.is_sleep_time():
-            return 'Offtime'
+            return 'InterTrial'
         elif self.resp_ready:
             return 'Cue'
         else:

diff --git a/core/Experiment.py b/core/Experiment.py
@@ -303,7 +303,6 @@ class StateOnset(dj.Part):
         # Trial state timestamps
         -> Trial
         time			    : int 	            # time from session start (ms)
-        ---
         state               : varchar(64)
         """
-Original file line number
+Diff line change
@@ Expand Up / @@ -303,7 +303,6 @@ class StateOnset(dj.Part): @@
             # Trial state timestamps
             -> Trial
             time			    : int 	            # time from session start (ms)
-            ---
             state               : varchar(64)
             """
@@ Expand Down @@