diff --git a/derivatives/lossless/code/config/face13_sbatch/c01_scalpart_remote.cfg b/derivatives/lossless/code/config/face13_sbatch/c01_scalpart_remote.cfg index e7bfbf25ff33d2a58c6bdcf76609e892ca82cbdb..9804fe16e92d62f7bd5b7ec5a933b16bb7a47d3e 100644 --- a/derivatives/lossless/code/config/face13_sbatch/c01_scalpart_remote.cfg +++ b/derivatives/lossless/code/config/face13_sbatch/c01_scalpart_remote.cfg @@ -59,7 +59,7 @@ job_init m_init derivatives/lossless/code/config/octave.minit submit_options - --account=def-jdesjard + memory 16g time_limit diff --git a/derivatives/lossless/code/config/face13_sbatch/c02_amica_init_remote.cfg b/derivatives/lossless/code/config/face13_sbatch/c02_amica_init_remote.cfg index 8cb286a946b7c679e2fb32a69cf44b354b1bfd3f..afe46854fea1f7c940fbf56d0a985d3c2c6a0ca1 100644 --- a/derivatives/lossless/code/config/face13_sbatch/c02_amica_init_remote.cfg +++ b/derivatives/lossless/code/config/face13_sbatch/c02_amica_init_remote.cfg @@ -19,7 +19,7 @@ job_init m_init submit_options - --account=def-jdesjard + memory 2G time_limit diff --git a/derivatives/lossless/code/config/face13_sbatch/c03_compart_data_remote.cfg b/derivatives/lossless/code/config/face13_sbatch/c03_compart_data_remote.cfg index 55a08bc5a85bed41eda6d91f457fd5cd6d24c66e..62100bdd152ebccfc2f7f8a7dae78ed84a14520e 100644 --- a/derivatives/lossless/code/config/face13_sbatch/c03_compart_data_remote.cfg +++ b/derivatives/lossless/code/config/face13_sbatch/c03_compart_data_remote.cfg @@ -15,7 +15,7 @@ replace_string [min_gap_ms],2000 [out_path],derivatives/lossless [amica_param_file],derivatives/lossless/code/misc/amica_default.param - [amica_threads_s07_08_09],8 + [amica_threads_s04],8 order [3 2] session_init @@ -29,7 +29,7 @@ job_init m_init derivatives/lossless/code/config/octave.minit submit_options - --account=def-jdesjard + memory 16g time_limit diff --git a/derivatives/lossless/code/config/face13_sbatch/c04a_amica_remote.cfg b/derivatives/lossless/code/config/face13_sbatch/c04a_amica_remote.cfg index ae46a0136b226dda151817d14e797291d6e8bc98..b53115bdeecdc4bc2cea69d8217d5f3b2c5eb5aa 100644 --- a/derivatives/lossless/code/config/face13_sbatch/c04a_amica_remote.cfg +++ b/derivatives/lossless/code/config/face13_sbatch/c04a_amica_remote.cfg @@ -19,7 +19,7 @@ job_init m_init submit_options - --account=def-jdesjard + memory 2G time_limit diff --git a/derivatives/lossless/code/config/face13_sbatch/c04b_amica_remote.cfg b/derivatives/lossless/code/config/face13_sbatch/c04b_amica_remote.cfg index 5b7507182025a02dd9b5e0b9215e625d50732d5c..01bec042bbdde7f6c58e2e4d3848488cecf68693 100644 --- a/derivatives/lossless/code/config/face13_sbatch/c04b_amica_remote.cfg +++ b/derivatives/lossless/code/config/face13_sbatch/c04b_amica_remote.cfg @@ -19,7 +19,7 @@ job_init m_init submit_options - --account=def-jdesjard + memory 2G time_limit diff --git a/derivatives/lossless/code/config/face13_sbatch/c04c_amica_remote.cfg b/derivatives/lossless/code/config/face13_sbatch/c04c_amica_remote.cfg index b1f0f1753d3b1c7964ab57200cfd9897d362a855..01bea69baa3f645773ce9c2113c824ad760cba22 100644 --- a/derivatives/lossless/code/config/face13_sbatch/c04c_amica_remote.cfg +++ b/derivatives/lossless/code/config/face13_sbatch/c04c_amica_remote.cfg @@ -19,7 +19,7 @@ job_init m_init submit_options - --account=def-jdesjard + memory 2G time_limit diff --git a/derivatives/lossless/code/config/face13_sbatch/c05_concat_data.cfg b/derivatives/lossless/code/config/face13_sbatch/c05_concat_data.cfg index 506bfa03fd2919d71de482e00208e9bc07b9fb87..8aa256e6175d388a549eb7918054052b807d85ff 100644 --- a/derivatives/lossless/code/config/face13_sbatch/c05_concat_data.cfg +++ b/derivatives/lossless/code/config/face13_sbatch/c05_concat_data.cfg @@ -35,7 +35,7 @@ job_init m_init derivatives/lossless/code/config/octave.minit submit_options - --account=def-jdesjard + memory 8g time_limit diff --git a/derivatives/lossless/code/config/octave.sesinit b/derivatives/lossless/code/config/octave.sesinit index db1b8ff16c0575f8310dd419912525fe3022d5f7..f4f0e3c376950b7a704105feaef352709c6ebebe 100644 --- a/derivatives/lossless/code/config/octave.sesinit +++ b/derivatives/lossless/code/config/octave.sesinit @@ -1,2 +1,2 @@ +module load gcc; module load octave; - diff --git a/derivatives/lossless/code/dependencies/eeglab_asr_amica b/derivatives/lossless/code/dependencies/eeglab_asr_amica index 669715cba56a6f164971de89e79f7a152eff1040..37e06371c320cbc0c71e67dc8a3287005651542f 160000 --- a/derivatives/lossless/code/dependencies/eeglab_asr_amica +++ b/derivatives/lossless/code/dependencies/eeglab_asr_amica @@ -1 +1 @@ -Subproject commit 669715cba56a6f164971de89e79f7a152eff1040 +Subproject commit 37e06371c320cbc0c71e67dc8a3287005651542f diff --git a/derivatives/lossless/code/scripts/qc_init.htb b/derivatives/lossless/code/scripts/qc_init.htb index 81632f6ee9af7c3a4cfc8db9adf28f62926d9aab..3d8cbd5c1f522dd7365f3011ac0274001db89936 100644 --- a/derivatives/lossless/code/scripts/qc_init.htb +++ b/derivatives/lossless/code/scripts/qc_init.htb @@ -1,5 +1,10 @@ %LOAD DATASET FILE... EEG = pop_loadset('filename','[batch_dfn]','filepath','[batch_dfp]'); + +if ~find(strcmpi({EEG.marks.chan_info.label},'ch_s_sd')); + EEG.marks=marks_add_label(EEG.marks,'chan_info',{'ch_s_sd',[1,0,0],[]}); +end; + EEG = eeg_checkset(EEG); % CHECK FOR IC CLASSIFICATION MARKS @@ -92,7 +97,6 @@ manual_ind=find(strcmp('manual',{EEG.marks.chan_info.label})); %RESET/INITIATE IC MARKS... EEG.marks=marks_add_label(EEG.marks,'comp_info',{'ambig',[.3,.3,1],[.3,.3,1],3,zeros(min(size(EEG.icaweights)),1)}); - manual_ind=find(strcmp('manual',{EEG.marks.comp_info.label})); ch_s_sd_ind=find(strcmp('ch_s_sd',{EEG.marks.chan_info.label})); ch_sd_ind=find(strcmp('ch_sd',{EEG.marks.chan_info.label})); @@ -110,7 +114,9 @@ other_ind=find(strcmp('other',{EEG.marks.comp_info.label})); ambig_ind=find(strcmp('ambig',{EEG.marks.comp_info.label})); EEG.marks.comp_info(manual_ind).order=1; -EEG.marks.comp_info(ch_s_sd_ind).order=2; +if ~isempty(ch_s_sd_ind); % skip study-wide criteria if not used + EEG.marks.comp_info(ch_s_sd_ind).order=2; +end; EEG.marks.comp_info(ch_sd_ind).order=2; EEG.marks.comp_info(low_r_ind).order=2; EEG.marks.comp_info(bridge_ind).order=2;