Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f81b42d
Merge pull request #1 from cab79/master
HumanPainResearchGroup Oct 2, 2017
db5e5b9
EEG Source Not Identified
HumanPainResearchGroup Oct 2, 2017
5a05265
Merge branch 'master' of https://github.com/HumanPainResearchGroup/Ma…
HumanPainResearchGroup Oct 2, 2017
a25c958
Merge branch 'master' of https://github.com/cab79/Matlab_files
HumanPainResearchGroup Oct 3, 2017
f962240
Merge branch 'master' of https://github.com/cab79/Matlab_files
HumanPainResearchGroup Oct 3, 2017
14d1121
Merge branch 'master' of https://github.com/HumanPainResearchGroup/Ma…
HumanPainResearchGroup Oct 3, 2017
3f2e9ca
Revert "Merge branch 'master' of https://github.com/HumanPainResearch…
HumanPainResearchGroup Oct 3, 2017
d17dd81
Merge branch 'master' of https://github.com/cab79/Matlab_files
HumanPainResearchGroup Oct 4, 2017
d89e17b
Delete Sequences
HumanPainResearchGroup Oct 20, 2017
5147a1a
Merge branch 'master' of https://github.com/cab79/Matlab_files
HumanPainResearchGroup Oct 20, 2017
369e46b
Un-delete
HumanPainResearchGroup Oct 20, 2017
601634f
Rootdir Change
HumanPainResearchGroup Oct 23, 2017
15bfe44
Merge branch 'master' of https://github.com/cab79/Matlab_files
HumanPainResearchGroup Oct 23, 2017
5f2c5be
Prep for Sarah
HumanPainResearchGroup Oct 24, 2017
0a1e457
Outputs
HumanPainResearchGroup Nov 1, 2017
12f81d7
Merge branch 'master' of https://github.com/cab79/Matlab_files
HumanPainResearchGroup Nov 1, 2017
0ff2623
Merge branch 'master' of https://github.com/cab79/Matlab_files
HumanPainResearchGroup Nov 27, 2017
9b608e6
Merge branch 'master' of https://github.com/cab79/Matlab_files
HumanPainResearchGroup Nov 30, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added NTIP/SCIn/Sequences/10Hz_control_High.mat
Binary file not shown.
Binary file added NTIP/SCIn/Sequences/10Hz_control_Low.mat
Binary file not shown.
Binary file added NTIP/SCIn/Sequences/10Hz_oddball_target_High.mat
Binary file not shown.
Binary file added NTIP/SCIn/Sequences/10Hz_oddball_target_Low.mat
Binary file not shown.
Binary file added NTIP/SCIn/Sequences/1Hz_control_High.mat
Binary file not shown.
Binary file added NTIP/SCIn/Sequences/1Hz_control_Low.mat
Binary file not shown.
Binary file added NTIP/SCIn/Sequences/1Hz_oddball_target_High.mat
Binary file not shown.
Binary file added NTIP/SCIn/Sequences/1Hz_oddball_target_Low.mat
Binary file not shown.
Binary file removed NTIP/SCIn/Sequences/Sequence_ASOT_Option1.mat
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed NTIP/SCIn/Sequences/Sequence_AudDiscrim_noAWE.mat
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed NTIP/SCIn/Sequences/Sequence_TactileAWE_Option10Hz.mat
Binary file not shown.
Binary file added NTIP/SCIn/Sequences/TEST_011117.mat
Binary file not shown.
8 changes: 4 additions & 4 deletions NTIP/SCIn/Settings/AuditoryAWE.m
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,22 @@

case '10Hz'
h.Settings.df = 10; % 10Hz = alpha. Other options: 1Hz, 25Hz, 40Hz.
h.Settings.patternvalue = [200 200]; % one per stimdur
h.Settings.patternvalue = [500 500]; % one per stimdur
h = AuditoryAWE(h,'commonsettings');

case '1Hz'
h.Settings.df = 1; % 10Hz = alpha. Other options: 1Hz, 25Hz, 40Hz.
h.Settings.patternvalue = [200 200]; % one per stimdur
h.Settings.patternvalue = [500 500]; % one per stimdur
h = AuditoryAWE(h,'commonsettings');

case '10Hz_oddball'
h.Settings.df = 10; % 10Hz = alpha. Other options: 1Hz, 25Hz, 40Hz.
h.Settings.patternvalue = [200 240]; % one per stimdur
h.Settings.patternvalue = [500 540]; % one per stimdur
h = AuditoryAWE(h,'commonsettings');

case '1Hz_oddball'
h.Settings.df = 1; % 10Hz = alpha. Other options: 1Hz, 25Hz, 40Hz.
h.Settings.patternvalue = [200 240]; % one per stimdur
h.Settings.patternvalue = [500 540]; % one per stimdur
h = AuditoryAWE(h,'commonsettings');

case 'commonsettings'
Expand Down