Commit f32756d2 authored by Tyler Collins's avatar Tyler Collins
Browse files

Merge branch 'new_params' into 'master'

New params



See merge request !13
parents db3dc886 1c3ffa59
......@@ -12,12 +12,16 @@ replace_string
[sd_t_meth],na
[sd_t_vals],[.15 .85]
[sd_t_o],3
[sd_t_p],.2
[sd_t_f_meth],fixed
[sd_t_f_vals],
[sd_t_f_o],.2
[sd_t_pad],1
[sd_ch_meth],q
[sd_ch_vals],[.15 .85]
[sd_ch_o],3
[sd_ch_p],.2
[sd_ch_f_meth],fixed
[sd_ch_f_vals] ],
[sd_ch_f_o],.2
[ref_loc_file],derivatives/lossless/code/misc/standard_1020_bucanl19.elc
[low_bound_hz],1
[high_bound_hz],30
......@@ -26,14 +30,18 @@ replace_string
[r_ch_meth],q
[r_ch_vals],[.15,.85]
[r_ch_o],3
[r_ch_p],.2
[r_ch_f_meth],fixed
[r_ch_f_vals],
[r_ch_f_o],.2
[bridge_trim],40
[bridge_z],6
[n_nbr_t],3
[r_t_meth],q
[r_t_vals],[.15 .85]
[r_t_o],3
[r_t_p],.2
[r_t_f_meth],fixed
[r_t_f_vals] ],
[r_t_f_o],.2
[min_gap_ms],2000
[out_path],derivatives/lossless
[amica_param_file],derivatives/lossless/code/misc/amica15_default.param
......
......@@ -9,7 +9,9 @@ replace_string
[sd_t_meth],q
[sd_t_vals],[.15 .85]
[sd_t_o],3
[sd_t_p],.2
[sd_t_f_meth],fixed
[sd_t_f_vals],
[sd_t_f_o],.2
[min_gap_ms],2000
[out_path],derivatives/lossless
[amica_param_file],derivatives/lossless/code/misc/amica_default.param
......
......@@ -9,7 +9,9 @@ replace_string
[sd_t_meth],q
[sd_t_vals],[.15 .85]
[sd_t_o],3
[sd_t_p],.2
[sd_t_f_meth],fixed
[sd_t_f_vals],
[sd_t_f_o],.2
[min_gap_ms],2000
[icr_crit],0.05
[dip_vol], derivatives/lossless/code/misc/standard_vol.mat
......
......@@ -126,8 +126,9 @@ else
'init_method','[sd_t_meth]', ...
'init_vals',[sd_t_vals], ...
'init_crit',[sd_t_o], ...
'flag_method','fixed', ...
'flag_val',[sd_t_p], ...
'flag_method','[sd_t_f_meth]',... % 'fixed', ...
'flag_vals',[ [sd_t_f_vals] ], ... % NEW
'flag_crit',[sd_t_f_o], ... % 'flag_val',[sd_t_p], ...
'plot_figs','off');
end
logging_log('INFO', 'CREATED EPOCH CRITERIA VECTOR...');
......@@ -167,8 +168,9 @@ logging_log('INFO', 'Assessing window data sd distributions...')
'init_method','[sd_ch_meth]', ...
'init_vals',[sd_ch_vals], ...
'init_crit',[sd_ch_o], ...
'flag_method','fixed', ...
'flag_val',[sd_ch_p], ...
'flag_method','[sd_ch_f_meth]', ... %fixed
'flag_vals',[ [sd_ch_f_vals] ], ...
'flag_crit',[sd_ch_f_o], ...
'plot_figs','off');
logging_log('INFO', 'CREATED CHANNEL CRITERIA VECTOR...');
......@@ -276,8 +278,9 @@ logging_log('INFO', 'Assessing channel r distributions criteria...')
'init_vals',[r_ch_vals], ...
'init_dir','neg', ...
'init_crit',[r_ch_o], ...
'flag_method','fixed', ...
'flag_val',[r_ch_p], ...
'flag_method','[r_ch_f_meth]', ...
'flag_vals',[ [r_ch_f_vals] ], ...
'flag_crit',[r_ch_f_o], ...
'plot_figs','off');
% Edit the channel flag info structure
......@@ -359,8 +362,9 @@ logging_log('INFO', 'Assessing epoch r distributions criteria...')
'init_vals',[r_t_vals], ...
'init_dir','neg', ...
'init_crit',[r_t_o], ...
'flag_method','fixed', ...
'flag_val',[r_t_p], ...
'flag_method','[r_t_f_meth]', ...
'flag_vals',[ [r_t_f_vals] ], ...
'flag_crit',[r_t_f_o], ...
'plot_figs','off');
logging_log('INFO', 'CREATED EPOCH CRITERIA VECTOR...');
......
......@@ -96,8 +96,9 @@ logging_log('INFO', 'Assessing window icaact sd distributions...')
'init_method','[sd_t_meth]', ...
'init_vals',[sd_t_vals], ...
'init_crit',[sd_t_o], ...
'flag_method','fixed', ...
'flag_val',[sd_t_p], ...
'flag_method','[sd_t_f_meth]', ...
'flag_vals',[ [sd_t_f_vals] ], ...
'flag_crit',[sd_t_f_o], ...
'plot_figs','off');
% Update marks rejection structure
......
......@@ -167,8 +167,9 @@ logging_log('INFO', 'Assessing window icaact sd distributions...')
'init_method','[sd_t_meth]', ...
'init_vals',[sd_t_vals], ...
'init_crit',[sd_t_o], ...
'flag_method','fixed', ...
'flag_val',[sd_t_p], ...
'flag_method','[sd_t_f_meth]', ...
'flag_vals',[ [sd_t_f_vals] ], ...
'flag_crit',[sd_t_f_o], ...
'plot_figs','off');
% Updating rejection structure
......@@ -203,8 +204,9 @@ logging_log('INFO', 'Assessing window icaact sd distributions...')
'init_method','[sd_t_meth]', ...
'init_vals',[sd_t_vals], ...
'init_crit',[sd_t_o], ...
'flag_method','fixed', ...
'flag_val',[sd_t_p], ...
'flag_method','[sd_t_f_meth]', ...
'flag_vals',[ [sd_t_f_vals] ], ...
'flag_crit',[sd_t_f_o], ...
'plot_figs','off');
% Updating rejection structure
......@@ -240,8 +242,9 @@ logging_log('INFO', 'Assessing window icaact sd distributions...')
'init_method','[sd_t_meth]', ...
'init_vals',[sd_t_vals], ...
'init_crit',[sd_t_o], ...
'flag_method','fixed', ...
'flag_val',[sd_t_p], ...
'flag_method','[sd_t_f_meth]', ...
'flag_vals',[ [sd_t_f_vals] ], ...
'flag_crit',[sd_t_f_o], ...
'plot_figs','off');
logging_log('INFO', 'TIME TO: CREATE WINDOW CRITERIA VECTOR...');
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment