Skip to main content
https://github.com/RaymondLab/Code
25 June 2024, 13:39:08 UTC
sort by:
RevisionAuthorDateMessageCommit Date
f1bbec0 Kellen Vu13 April 2023, 22:40:57 UTCMerge branch 'VerticalTracking' of https://github.com/RaymondLab/Code into VerticalTracking # Conflicts: # EyeTracking/eyeCalibration.mlapp # Tools/ChannelFunctions/desaccadeVel_A.m13 April 2023, 22:40:57 UTC
1c69a6f Kellen Vu29 September 2022, 22:01:42 UTCtemp (DO NOT PULL)13 April 2023, 22:37:28 UTC
db895f3 Kellen Vu09 December 2021, 20:26:05 UTCAdd some code that allows the user to stop the calibration at a certain frame13 April 2023, 22:37:28 UTC
1c68b04 Kellen Vu30 November 2021, 07:28:24 UTCFix a bug; "manual frame redo" now saves the updated frame data to the .mat file13 April 2023, 22:37:28 UTC
8f9fb1f Kellen Vu30 November 2021, 06:14:24 UTCFix a bug in the "redo selected frame" button13 April 2023, 22:37:28 UTC
ccfd5ef Kellen Vu13 April 2023, 22:09:16 UTC[Eye Calibration] Add scrollbar to window, and fix a bug in the lowpass filter13 April 2023, 22:09:16 UTC
3c5722b D243A Rig01 April 2023, 05:33:03 UTC[Integrator] Rename integrator protocol within parameters file01 April 2023, 05:33:03 UTC
1f46558 D243A Rig31 March 2023, 22:20:24 UTCRename Kellen's Integrator Protocol folder Also fix one of the print statements31 March 2023, 22:25:31 UTC
3d78fa7 Brian Angeles (Laptop)14 March 2023, 22:18:58 UTCMerge branch 'preallocation_fix' into Master14 March 2023, 22:18:58 UTC
b21f758 Brian Angeles (Laptop)14 March 2023, 22:18:01 UTCFixed issue regarding preallocated arrays for time data Corrected the preallocation to generate Nx1 arrays, not NxN matrices. - previous version was causing major performance issues.14 March 2023, 22:18:01 UTC
29b7be5 Kellen Vu07 February 2023, 22:45:07 UTC[Integrator] Disable drift fix during experiment07 February 2023, 22:45:07 UTC
0eb46a9 Kellen Vu07 February 2023, 22:18:30 UTC[Integrator] Fix bug07 February 2023, 22:18:30 UTC
1349eb7 Kellen Vu06 February 2023, 19:18:14 UTC[Integrator] Add more detailed logging06 February 2023, 19:18:14 UTC
923d8b5 Kellen Vu06 February 2023, 11:07:10 UTC[Integrator] Stop drum/chair movement during test phase06 February 2023, 11:07:10 UTC
abd40e6 Kellen Vu14 December 2022, 03:09:21 UTCFix integrator bug14 December 2022, 03:12:35 UTC
bd54b67 Kellen Vu14 December 2022, 03:02:45 UTCIncorporate drift fix for integrator protocols14 December 2022, 03:02:45 UTC
0aa9a88 Kellen Vu13 December 2022, 02:45:20 UTCFiles for integrator experiments13 December 2022, 02:45:20 UTC
6301cd4 Katie09 December 2022, 20:28:46 UTCOnly record data into arrays for calibration run (#4) Before, experimentalists were experiencing time delays of up to 20 seconds when adjusting the cameras for the eyeCalibration. This was due to a bug in the code, where we were writing to matrix data when it was not preallocated, and we would get large pauses at Matlab generated more room and space for the data. For example, there would be long pauses at 4032 or so in the time arena, because it would need to wait for Matlab to increase the array sizes. Also removed an output statement and converted it into a print statement, because it's generally best practices to do that way instead. Summary: - Stop recording data when we're in preview mode - Preallocate arrays for time vectors09 December 2022, 20:28:46 UTC
a27085f Kellen Vu18 November 2022, 23:12:45 UTCRemove unnecessary integrator experiment files These are the integrator project files written by Ella Tessier-Lavigne. I'm going to modify and replace them, so I'm removing them for now to clean up the experimental protocol folder.18 November 2022, 23:14:26 UTC
c50482d Katie11 November 2022, 23:09:48 UTCScript for calibration and pretest for Trace (#1) After lots of struggling to work with the Spike2 code, and it's general complexity and the setup, it seemed more reasonable to split it out into another file based on how the configuration and other setups are. In practice running this "pre-test" is just like running another experiment, and the distinction between the two isn't super clear or separate. Issues I ran into incorporating it into a second "button" on the script: 1. Needing to change the "is the experiment running" state variable (runExmpt) to be 0, 1, or 2 instead of just 0 or 1. It felt strange to have it work that way 2. Configurations do not fit well - and adding another button adds to the confusion. 3. You can't call the pre-test function with multiple different variables easily, because of the way that ToolbarIdle%() run sequentially each time. The complexity of the logic required is high..we'd have to create multiple other states for the "runExpmt=0-10" or something, and some way to increment it? 4. Need to add additional variables and prevent people from running the normal experiment at the same time as the test experiment. I had disabled the button, but the UI experiment is limited - i.e. we can't tell the user why the button is disabled.11 November 2022, 23:09:48 UTC
db59e25 Kellen Vu09 November 2022, 23:22:39 UTCRename D243a protocols to D243 Clarifies that they work for both D243a and D243b.10 November 2022, 22:15:11 UTC
3566404 Katie04 November 2022, 23:55:03 UTCD241B experimental setup files Add D241B rig files to the RaymondLab code04 November 2022, 23:55:03 UTC
e9bb4bd Katie Li04 November 2022, 23:31:20 UTCUse the correct Parameters_Universal_Trace file The Parameters_Universal_Trace file was being unused on his rig, so here we are renaming the one that was being run for a while or Parameters_Universal_temp_SumofSine.s2s to Parameters_Universal_Trace.s2s so that it more accurately reflects the one he is using. Adding a file with "temp" in it felt weird because this has been used in multiple experiments and wasn't exactly temporary04 November 2022, 23:31:20 UTC
dac02b8 Katie Li04 November 2022, 23:09:10 UTCRearrange RigChoice to keep 243 rig functionality04 November 2022, 23:09:10 UTC
b577727 Katie Li04 November 2022, 22:44:55 UTCMerge branch 'Master' of https://github.com/RaymondLab/Code into consolidation_project_241B04 November 2022, 22:52:37 UTC
c8e9307 Katie Li04 November 2022, 22:39:54 UTCRemove unused waveform file, undo changes to Experiment_Default Most of the "play_waveform" file was commented out, and it's unknown if there are current uses in the existing codebase. Also removing the one-off comment from Experiment_Default.s2s, because it's not relevant to the other experimenters. The comment of using 1 instead of 2 for the prePostNum is in the Experiment_Trace_Nov2022.s2s file, and is probably safe being stored there.04 November 2022, 22:42:52 UTC
8ed0bc6 Kellen Vu03 November 2022, 01:23:38 UTCFixes a bug where eyeCalibration.mlapp was trying to get the sample rate from the wrong smr channel. I tested this in D243b, and it should work for other computers, but let me know if it doesn't.03 November 2022, 01:23:38 UTC
1611f97 Kellen Vu03 November 2022, 01:20:55 UTCRemove counter from MATLAB console during runEyeCalibration to make the console cleaner03 November 2022, 01:20:55 UTC
2286990 Katie Li02 November 2022, 22:57:52 UTCSeparating the experiment files that are diverging02 November 2022, 22:57:52 UTC
333020c Katie02 November 2022, 21:48:26 UTCRemove small modifications to Alex's script Avoiding conflicting versions when no documentation is available for reasoning on why Alex's script was updated. Sima joined in 2020 during the pandemic - it's more likely that these changes were from testing out code and not actually intending to change it02 November 2022, 21:49:24 UTC
39a53f6 Katie Li02 November 2022, 21:25:35 UTCSeparate D006 parameters from those on D241B The parameter files used for D241B used to be modified from D006, and it was confusing and not correct for us to merge the updates specific to the D241B rig into the Parameters_D006.s2s file. That file was also using the sequencer calibrated file "Sequencer_D019Copy.pls" - which makes more sense to be renamed to align with "Sequencer_D241B.pls" becauase the D019 was a room in the basement and not the current rig setup for D241B. I reverted the changes to "Parameters_D006.s2s".02 November 2022, 21:25:35 UTC
1b37f6e Katie Li02 November 2022, 21:03:42 UTCUpdating waveform file paths, remove unused scripts Several of these scripts are not used in other places, and appear like they were temporary or testing ones. The reason why we are keeping the "Parameters_Univesal_temp_SumofSines.s2s" files though is that it's being currently run in the experiments, on the rig 241B. I am updating the filepath to the expected waveform file, because we should store a complete copy of the data acquisition code.02 November 2022, 21:03:42 UTC
3f0a632 Katie Li02 November 2022, 18:59:57 UTCMerge branch 'consolidation_project_241B' of https://github.com/RaymondLab/Code into consolidation_project_241B02 November 2022, 18:59:57 UTC
84681e4 Katie Li02 November 2022, 18:59:23 UTCAdd the other lost files02 November 2022, 18:59:23 UTC
0c43ffe Katie01 November 2022, 22:38:09 UTCApply suggestions from code review Remove whitespace and non-functional changes01 November 2022, 22:38:09 UTC
21f7d24 Katie Li31 October 2022, 22:31:35 UTCSpike2 files for consolidation31 October 2022, 22:31:35 UTC
b5a6d28 Kellen Vu17 October 2022, 23:52:05 UTCAdd rig parameters for D243a17 October 2022, 23:52:05 UTC
3da11a5 Kellen Vu03 October 2022, 21:10:34 UTCRe-add Alz_BPS_VOR analysis type to GUI (was lost in merge)03 October 2022, 21:10:34 UTC
0567e72 Sriram J03 October 2022, 20:57:59 UTCMerge branch 'Master' of https://github.com/RaymondLab/Code into Master * 'Master' of https://github.com/RaymondLab/Code: Add Alz_BPS_VOR analysis type Calibration camera rename Calibration camera rename # Conflicts: # Tools/VOR_Analysis/VOR_GUI_App.mlapp03 October 2022, 20:57:59 UTC
d706d89 Sriram J03 October 2022, 20:45:32 UTCChanges the keystroke so that 35th minute for the VOR will be detected correctly. And corrects the calibration factor so that when you have OKR and VOR in the same file, the phase of those two will be accurate. - Sima03 October 2022, 20:45:32 UTC
c0277aa Kellen Vu03 October 2022, 07:08:14 UTCAdd Alz_BPS_VOR analysis type03 October 2022, 07:08:14 UTC
29ad84c Kellen Vu29 September 2022, 22:01:42 UTCtemp (DO NOT PULL)29 September 2022, 22:01:42 UTC
2b5a06d RaymondLab27 February 2022, 21:51:43 UTCCalibration camera rename Add user interface descriptions for "runEyeCalibration"27 February 2022, 21:51:43 UTC
ab60004 RaymondLab27 February 2022, 21:50:07 UTCCalibration camera rename Add user interface descriptions for "runEyeCalibration"27 February 2022, 21:50:07 UTC
52ce916 RaymondLab15 January 2022, 03:07:18 UTCUpdate calceyeangle_APP.m Modifying horizontal position (changing d2 to -1*d2)15 January 2022, 03:07:18 UTC
9d618fe Kellen Vu09 December 2021, 20:26:57 UTCAdd Ella's integrator protocols09 December 2021, 20:26:57 UTC
84ff506 Kellen Vu09 December 2021, 20:26:05 UTCAdd some code that allows the user to stop the calibration at a certain frame09 December 2021, 20:26:05 UTC
bea48d0 Kellen Vu30 November 2021, 07:28:24 UTCFix a bug; "manual frame redo" now saves the updated frame data to the .mat file30 November 2021, 07:28:24 UTC
5ef5b1c Kellen Vu30 November 2021, 06:14:36 UTCRemove the txt file from Max's demo30 November 2021, 06:14:36 UTC
ffe28de Kellen Vu30 November 2021, 06:14:24 UTCFix a bug in the "redo selected frame" button30 November 2021, 06:14:24 UTC
6aef561 Kellen Vu28 November 2021, 00:29:58 UTCChanges to eyeCalibration.mlapp from D253 computer28 November 2021, 00:29:58 UTC
41c7bf9 Kellen Vu27 November 2021, 05:00:45 UTCRemove the txt file from Max's SourceTree demo27 November 2021, 05:00:45 UTC
f55a940 Kellen Vu26 November 2021, 23:46:39 UTCMerge branch 'Master' of https://github.com/RaymondLab/Code into Master26 November 2021, 23:46:39 UTC
f928237 Kellen Vu26 November 2021, 23:46:33 UTCMerge branch 'Calibration' into Master # Conflicts: # Max_test.txt26 November 2021, 23:46:33 UTC
87a1f51 Kellen Vu26 November 2021, 23:44:30 UTCAdd vertical eye tracking to Eye Calibration26 November 2021, 23:44:30 UTC
efcff13 Kellen Vu17 August 2021, 03:39:52 UTCMinor bug fixes - adds scrollbars to the eyeCalibration app, and fixes the lowpass filter used for desaccading in eyeCalibration17 August 2021, 03:39:52 UTC
087bfdc RaymondLab17 November 2020, 02:21:43 UTCFixing eye calibration bugs: Framerate Histogram and Magnet Channel Saving17 November 2020, 02:21:43 UTC
e7c1d00 Kellen Vu28 September 2020, 08:47:07 UTCSmall bug fix - fixes the window size of eye calibration app28 September 2020, 08:47:07 UTC
a74524e RaymondLab25 September 2020, 19:42:51 UTCAdding movingslope file to repository for VOR_analysis25 September 2020, 19:42:51 UTC
90c9f4f RaymondLab22 September 2020, 19:48:00 UTCSmall bug fixes due to function naming issues22 September 2020, 19:48:00 UTC
c331585 RaymondLab14 September 2020, 19:02:29 UTCSmall change so that when running VOR_GUI_App the window shows up in the middle of the screen14 September 2020, 19:02:29 UTC
116c76a RaymondLab11 September 2020, 01:20:53 UTCNew VOR_GUI_app functionality. Allows for more user input - Can change the frequency of the initial low pass filter when cleaning signals, as well as transient threshold and filter window size for desaccading11 September 2020, 01:20:53 UTC
a446262 Alex Fanning11 June 2020, 22:06:06 UTCMerge branch 'Master' of https://github.com/RaymondLab/Code into Master11 June 2020, 22:06:06 UTC
96344ab Alex Fanning11 June 2020, 22:05:56 UTCMerge branch 'Master' of https://github.com/RaymondLab/Code into Master # Conflicts: # EyeTracking/eyeCalibration.mlapp11 June 2020, 22:05:56 UTC
8baf015 Sriram J11 June 2020, 22:00:32 UTCMerge branch 'Master' of https://github.com/RaymondLab/Code into Master * 'Master' of https://github.com/RaymondLab/Code: Add line to Sriram's file # Conflicts: # Max_test.txt11 June 2020, 22:00:32 UTC
1f00e1d Sriram J11 June 2020, 21:56:18 UTCThird change in the demo11 June 2020, 21:56:18 UTC
7d0f1a4 Selvanar11 June 2020, 21:52:29 UTCAdd line to Sriram's file11 June 2020, 21:52:29 UTC
9f44957 GracelessGhost11 June 2020, 21:49:00 UTCAdd a line to the demo11 June 2020, 21:49:00 UTC
ddb8cb5 Sriram J11 June 2020, 21:44:32 UTCAdd a file as a part of Max's sourcetree demo11 June 2020, 21:44:32 UTC
1b0018a Selvanar08 June 2020, 19:46:29 UTCHuge update to Calibration Tool08 June 2020, 19:46:29 UTC
d00147b Selvanar13 April 2020, 20:15:04 UTCLarge Calibration Update. Stable13 April 2020, 20:15:04 UTC
b9c6e97 Max's Office PC20 March 2020, 18:30:00 UTCModifications for max. Do not update to this revision20 March 2020, 18:30:00 UTC
02e07a6 Max's Office PC11 March 2020, 22:33:20 UTCWork to take home. do not update to this revision.11 March 2020, 22:33:20 UTC
879708a Max's Office PC28 February 2020, 01:06:11 UTCBug Fix: ROI Selection improvements for Eye Calibration App28 February 2020, 01:06:11 UTC
e23a4c4 Max's Office PC26 February 2020, 00:47:22 UTCUpdate CF Project26 February 2020, 00:47:22 UTC
08e8f8f Max's Office PC25 February 2020, 03:29:14 UTCUpdate CF Project25 February 2020, 03:29:14 UTC
f851706 Max's Office PC21 February 2020, 23:19:45 UTCAdditional Code for Amin's most recent experiment21 February 2020, 23:19:45 UTC
4776ce5 Max's Office PC20 February 2020, 20:11:43 UTCUpdate CF Project. Add some useful misc function.20 February 2020, 20:11:43 UTC
fe272d8 Max's Office PC20 February 2020, 20:08:23 UTCAdd new Experiment for Amin. Prototype, not tested yet.20 February 2020, 20:08:23 UTC
63fc836 Max's Office PC30 January 2020, 04:09:01 UTCUpdate Experiment for HG. Add doublets for each section, and remove chance of repeated expmt types.30 January 2020, 04:09:01 UTC
be642cb Max's Office PC30 January 2020, 03:47:28 UTCAdd new experiment for Alex. Same as default script, except the training segments alternate between x2 and x0.30 January 2020, 03:47:28 UTC
97251a4 Max's Office PC28 January 2020, 05:13:07 UTCMerge branch 'Master' of https://github.com/RaymondLab/Code into Master28 January 2020, 05:13:07 UTC
3816ce8 Max's Office PC28 January 2020, 05:12:23 UTCUpdate CF Project28 January 2020, 05:12:23 UTC
b68c1c3 RaymondLab_040621 January 2020, 22:32:06 UTCTune D004/D006 Carco Motor (Chair)21 January 2020, 22:32:06 UTC
bb7fbb2 RaymondLab_040621 January 2020, 22:26:45 UTCMerge branch 'Master' of https://github.com/RaymondLab/Code into Master21 January 2020, 22:26:45 UTC
585530d Max's Office PC13 January 2020, 18:00:19 UTCSequencer changes and params universal changes for Hyun Geun Experiements. Not tested yet.13 January 2020, 18:00:19 UTC
24e7057 Max's Office PC11 January 2020, 01:05:12 UTCAdd 3 Experiment Rough Drafts for Hyun Geun. They need changes in the sequencer and Parameters default files that will come later. None of these have been testing on a rig yet.11 January 2020, 01:05:12 UTC
5455d37 Max's Office PC09 January 2020, 23:48:55 UTCAdd new Experiment protocol for Sriram. This new experiment ius based on the Default Reversed Experiment. This new versions adds 2 OKR segments before the pretests and 2 OKR segments after the posttests, but before the 35 min test.09 January 2020, 23:48:55 UTC
4848401 Alex Fanning08 January 2020, 19:58:28 UTCno message08 January 2020, 19:58:28 UTC
4c74601 Max's Office PC08 January 2020, 19:54:20 UTCMerge branch 'Master' of https://github.com/RaymondLab/Code into Master08 January 2020, 19:54:20 UTC
b6121d7 Max's Office PC08 January 2020, 19:52:02 UTCAdd script for Alex Analysis08 January 2020, 19:52:02 UTC
1357cb2 D019 Rig19 December 2019, 23:30:38 UTCFix printing error during video eye tracking19 December 2019, 23:30:38 UTC
4dbf0ec D019 Rig19 December 2019, 23:25:22 UTCUpdate Calibration19 December 2019, 23:25:22 UTC
4cac1d4 Max's Office PC19 December 2019, 21:51:34 UTCBug Fix. Small subset of experiments that did not record the 'x' denoting the end of a segment. This fix addes a 'x' 45 seconds (the typical segment length) when one is not found.19 December 2019, 21:51:34 UTC
1181b1e Max's Office PC19 December 2019, 01:19:42 UTCUpdate Calibration. Huge update. Single Eye Analysis, Elipse ROI instead of Box, Improved Linearity Plots, bug fixes.19 December 2019, 01:19:42 UTC
29b17a2 Max's Office PC17 December 2019, 00:16:41 UTCBug Fix for adding a missing 'x' tag on the final segment of the experiment17 December 2019, 00:16:41 UTC
e666b50 Max's Office PC12 December 2019, 22:33:17 UTCMerge branch 'Master' into Calibration12 December 2019, 22:33:17 UTC
5567c5f D019 Rig12 December 2019, 21:53:13 UTCSolution for common rig choice errors. Cosmetic changes12 December 2019, 21:53:13 UTC
189d06d D019 Rig12 December 2019, 20:39:50 UTCUpdate Alex's Experiment and add two new ones.12 December 2019, 20:39:50 UTC
3968257 Max's Office PC11 December 2019, 16:41:45 UTCCalibration Changes11 December 2019, 16:41:45 UTC
back to top