Index: gliderproc/trunk/gliderEcopuck_Generate_L1_Data.m =================================================================== --- gliderproc/trunk/gliderEcopuck_Generate_L1_Data.m (revision 512) +++ gliderproc/trunk/gliderEcopuck_Generate_L1_Data.m (revision 513) @@ -62,4 +62,10 @@ cdom = []; scatter = []; + chlor_sig = []; + cdom_sig = []; + scatter_sig = []; + chlor_ref = []; + cdom_ref = []; + scatter_ref = []; ptime_ebd = []; @@ -67,11 +73,23 @@ switch gliderIndex case 1 % Pelagia - chlor_name = 'sci_bbfl2s_chlor_scaled'; - cdom_name = 'sci_bbfl2s_cdom_scaled'; - scatter_name = 'sci_bbfl2s_bb_scaled'; + chlor_name = 'sci_bbfl2s_chlor_scaled'; + cdom_name = 'sci_bbfl2s_cdom_scaled'; + scatter_name = 'sci_bbfl2s_bb_scaled'; + chlor_sig_name = 'sci_bbfl2s_chlor_sig'; + cdom_sig_name = 'sci_bbfl2s_cdom_sig'; + scatter_sig_name = 'sci_bbfl2s_bb_sig'; + chlor_ref_name = 'sci_bbfl2s_chlor_ref'; + cdom_ref_name = 'sci_bbfl2s_cdom_ref'; + scatter_ref_name = 'sci_bbfl2s_bb_ref'; case 2 % Ramses - chlor_name = 'sci_flbbcd_chlor_units'; - cdom_name = 'sci_flbbcd_cdom_units'; - scatter_name = 'sci_flbbcd_bb_units'; + chlor_name = 'sci_flbbcd_chlor_units'; + cdom_name = 'sci_flbbcd_cdom_units'; + scatter_name = 'sci_flbbcd_bb_units'; + chlor_sig_name = 'sci_flbbcd_chlor_sig'; + cdom_sig_name = 'sci_flbbcd_cdom_sig'; + scatter_sig_name = 'sci_flbbcd_bb_sig'; + chlor_ref_name = 'sci_flbbcd_chlor_ref'; + cdom_ref_name = 'sci_flbbcd_cdom_ref'; + scatter_ref_name = 'sci_flbbcd_bb_ref'; end @@ -106,4 +124,22 @@ data.data(:,strmatch(scatter_name,... data.vars, 'exact'))]; + chlor_sig = [chlor_sig; ... + data.data(:,strmatch(chlor_sig_name,... + data.vars, 'exact'))]; + cdom_sig = [cdom_sig; ... + data.data(:,strmatch(cdom_sig_name,... + data.vars, 'exact'))]; + scatter_sig = [scatter_sig; ... + data.data(:,strmatch(scatter_sig_name,... + data.vars, 'exact'))]; + chlor_ref = [chlor_ref; ... + data.data(:,strmatch(chlor_ref_name,... + data.vars, 'exact'))]; + cdom_ref = [cdom_ref; ... + data.data(:,strmatch(cdom_ref_name,... + data.vars, 'exact'))]; + scatter_ref = [scatter_ref; ... + data.data(:,strmatch(scatter_ref_name,... + data.vars, 'exact'))]; ptime_ebd = [ptime_ebd; ... data.data(:,strmatch('sci_m_present_time',... @@ -121,4 +157,10 @@ cdom = cdom(i); scatter = scatter(i); + chlor_sig = chlor_sig(i); + cdom_sig = cdom_sig(i); + scatter_sig = scatter_sig(i); + chlor_ref = chlor_ref(i); + cdom_ref = cdom_ref(i); + scatter_ref = scatter_ref(i); ptime_ebd = ptime_ebd(i); @@ -130,4 +172,10 @@ cdom = cdom(I); scatter = scatter(I); + chlor_sig = chlor_sig(I); + cdom_sig = cdom_sig(I); + scatter_sig = scatter_sig(I); + chlor_ref = chlor_ref(I); + cdom_ref = cdom_ref(I); + scatter_ref = scatter_ref(I); % convert ptime into datenum style... @@ -139,4 +187,10 @@ 'cdom', 'ppb', ... 'scatter', '1/mm', ... + 'chlor_sig', 'count', ... + 'cdom_sig', 'count', ... + 'scatter_sig', 'count', ... + 'chlor_ref', 'count', ... + 'cdom_ref', 'count', ... + 'scatter_ref', 'count', ... 'ptime_ebd', 'seconds since 0000-01-01T00:00', ... 'ptime_ebd_datenum', 'days since 1970-01-01T00:00'); @@ -146,4 +200,10 @@ 'cdom', 'chromophoric dissolved organic matter', ... 'scatter', 'backscatter', ... + 'chlor_sig', 'chlorophyll raw count', ... + 'cdom_sig', 'chromophoric dissolved organic matter raw count', ... + 'scatter_sig', 'backscatter raw count', ... + 'chlor_ref', 'chlorophyll reference count', ... + 'cdom_ref', 'chromophoric dissolved organic matter reference count', ... + 'scatter_ref', 'backscatter reference count', ... 'ptime_ebd', 'science computer time', ... 'ptime_ebd_datenum', 'science computer date'); @@ -165,4 +225,10 @@ 'cdom', ... 'scatter', ... + 'chlor_sig', ... + 'cdom_sig', ... + 'scatter_sig', ... + 'chlor_ref', ... + 'cdom_ref', ... + 'scatter_ref', ... 'ptime_ebd', ... 'ptime_ebd_datenum');