Commits

Show all
Author Commit Message Labels Comments Date
kdai
Adding changes to use threadmill for head-in events.
kdai
Adding initial files for multimouse testing.
kdai
Merge with old
Ryan Brackney
Created new branch retroactively, prior to v2 fork
Branches
old
<rya...@gmail.com
added a BoxState
<rya...@gmail.com
Continued working
<rya...@gmail.com
Making a new, more flexible and readable version of D2
ryan...@asu.edu
Changed the D2 head in wait time before a trial starts to 0 seconds, for now, and two new spin boxes to the GUI that will be used later
ryan...@asu.edu
Updated the ViVi so that the discrimination condition works
ryan...@asu.edu
Added a session type called "D2 Grad" that reduces the proportion of S+ trials from 100 to 50 over 5 blocks and continues for another 10 blocks at 50%
ryan...@asu.edu
Actually added the VI program, removed old Phase3 scripts
ryan...@asu.edu
Change the GUI so that there's a pulldown menu for the different session types Added a Variable Interval session type. It's confirmed to work, however data acquisition still needs to be added to it
ryan...@asu.edu
Working on the VI program. Current draft, incomplete
ryan...@asu.edu
Renamed Discrimination2_7 to Discrimination2, and got rid of the excess files
ryan...@asu.edu
Merge
ryan...@asu.edu
.
ryan...@asu.edu
Removed a few issue small bits of code in Disc2 that were causing switches to be repeatedly called on/off. These *may* have been contributing to the occasional lack of voltage to the box, which was causing the issue measuring head entries.
Richard Gerkin
Merged
Richard Gerkin
Automatically pull experiment metadata lists from server; commented out right now (__main__.py lin 522)
kdai
Commiting instructions for building stand-alone executable.
kdai
Allows to build the olfactometer as a stand-alone executable.
Richard Gerkin
Menu option files now findable no matter what directory (or OS) the program is launched from
Richard Gerkin
Merged
Richard Gerkin
Changes to enable program to be run without an olfactometer (for testing)
<rya...@gmail.com
Updated the GUI so that hits/misses/ect are aligned properly, removed the seperate "close button" Added a measure of Accuracy/False Alarms/Ect still needs to be tested however
ryan...@asu.edu
Added the the buffer to head entry registering as out to the D2 program, set to 0.5 s. It appears that this buffer gives us far more FA than misses with M14.
ryan...@asu.edu
Stopped versioning auto-generated qt/gui.py
ryan...@asu.edu
Deleted __main2__ (renamed to __main__ in earlier commit)
ryan...@asu.edu
Changed __main2__.py to __main__
ryan...@asu.edu
Changed where the "session type" is put in the data file.
  1. Prev
  2. Next