Index: gliderproc/trunk/gliderOptode_Generate_L1_Data.m =================================================================== --- gliderproc/trunk/gliderOptode_Generate_L1_Data.m (revision 507) +++ gliderproc/trunk/gliderOptode_Generate_L1_Data.m (revision 514) @@ -144,43 +144,45 @@ % concatenate variables with data... if(~isempty(data.data)) - oxyw_oxygen = [oxyw_oxygen; ... - data.data(:,strmatch('sci_oxy3835_wphase_oxygen',... - data.vars, 'exact'))]; - oxyw_saturation = [oxyw_saturation; ... - data.data(:,strmatch('sci_oxy3835_wphase_saturation',... - data.vars, 'exact'))]; - oxyw_temp = [oxyw_temp; ... - data.data(:,strmatch('sci_oxy3835_wphase_temp',... - data.vars, 'exact'))]; - oxyw_dphase = [oxyw_dphase; ... - data.data(:,strmatch('sci_oxy3835_wphase_dphase',... - data.vars, 'exact'))]; - % oxyw_bphase = [oxyw_bphase; ... - % data.data(:,strmatch('sci_oxy3835_wphase_bphase',... - % data.vars, 'exact'))]; - % oxyw_rphase = [oxyw_rphase; ... - % data.data(:,strmatch('sci_oxy3835_wphase_rphase',... - % data.vars, 'exact'))]; - % oxyw_bamp = [oxyw_bamp; ... - % data.data(:,strmatch('sci_oxy3835_wphase_bamp',... - % data.vars, 'exact'))]; - % oxyw_bpot = [oxyw_bpot; ... - % data.data(:,strmatch('sci_oxy3835_wphase_bpot',... - % data.vars, 'exact'))]; - % oxyw_ramp = [oxyw_ramp; ... - % data.data(:,strmatch('sci_oxy3835_wphase_ramp',... - % data.vars, 'exact'))]; - % oxyw_rawtemp = [oxyw_rawtemp; ... - % data.data(:,strmatch('sci_oxy3835_wphase_rawtemp',... - % data.vars, 'exact'))]; - % oxyw_time = [oxyw_time; ... - % data.data(:,strmatch('sci_oxy3835_wphase_timestamp',... - % data.vars, 'exact'))]; - % oxyw_installed = [oxyw_installed; ... - % data.data(:,strmatch('sci_oxy3835_wphase_is_installed',... - % data.vars, 'exact'))]; - ptime_ebd = [ptime_ebd; ... - data.data(:,strmatch('sci_m_present_time',... - data.vars, 'exact'))]; + if (~isempty(strmatch('sci_oxy3835_wphase_oxygen',data.vars,'exact'))) + oxyw_oxygen = [oxyw_oxygen; ... + data.data(:,strmatch('sci_oxy3835_wphase_oxygen',... + data.vars, 'exact'))]; + oxyw_saturation = [oxyw_saturation; ... + data.data(:,strmatch('sci_oxy3835_wphase_saturation',... + data.vars, 'exact'))]; + oxyw_temp = [oxyw_temp; ... + data.data(:,strmatch('sci_oxy3835_wphase_temp',... + data.vars, 'exact'))]; + oxyw_dphase = [oxyw_dphase; ... + data.data(:,strmatch('sci_oxy3835_wphase_dphase',... + data.vars, 'exact'))]; + % oxyw_bphase = [oxyw_bphase; ... + % data.data(:,strmatch('sci_oxy3835_wphase_bphase',... + % data.vars, 'exact'))]; + % oxyw_rphase = [oxyw_rphase; ... + % data.data(:,strmatch('sci_oxy3835_wphase_rphase',... + % data.vars, 'exact'))]; + % oxyw_bamp = [oxyw_bamp; ... + % data.data(:,strmatch('sci_oxy3835_wphase_bamp',... + % data.vars, 'exact'))]; + % oxyw_bpot = [oxyw_bpot; ... + % data.data(:,strmatch('sci_oxy3835_wphase_bpot',... + % data.vars, 'exact'))]; + % oxyw_ramp = [oxyw_ramp; ... + % data.data(:,strmatch('sci_oxy3835_wphase_ramp',... + % data.vars, 'exact'))]; + % oxyw_rawtemp = [oxyw_rawtemp; ... + % data.data(:,strmatch('sci_oxy3835_wphase_rawtemp',... + % data.vars, 'exact'))]; + % oxyw_time = [oxyw_time; ... + % data.data(:,strmatch('sci_oxy3835_wphase_timestamp',... + % data.vars, 'exact'))]; + % oxyw_installed = [oxyw_installed; ... + % data.data(:,strmatch('sci_oxy3835_wphase_is_installed',... + % data.vars, 'exact'))]; + ptime_ebd = [ptime_ebd; ... + data.data(:,strmatch('sci_m_present_time',... + data.vars, 'exact'))]; + end end