diff --git a/TSGQC_amelioration.xls b/TSGQC_amelioration.xls index abb034e8162e20017da4d95594ea20543cf908f5..6b2032b91db35c5af046d286a915d0ab94e4baf8 100644 Binary files a/TSGQC_amelioration.xls and b/TSGQC_amelioration.xls differ diff --git a/tsg_util/calibration.m b/tsg_util/calibration.m index 22cc03eabfcefb5ebaadc70ef7935094adb2ed6f..ffbe13dc78bdd2177604b6cceab402c1ac2b6b06 100644 --- a/tsg_util/calibration.m +++ b/tsg_util/calibration.m @@ -7,6 +7,14 @@ function calibration( hMainFig ) % % Compute salinity from calibrated conductivity and jacket temperature % +% Bug : +% 1 - tsg.SSPS_CAL = sw_salt( cond/sw_c3515(),t90TOt68(temp),zeros(size(cond))); +% replaced by +% tsg.SSPS_CAL = sw_salt( cond/sw_c3515(),temp,zeros(size(cond))); +% +% CSIRO toolbox modified sw_salt modified to use temprature ITS90 +% +% % Get tsg application data % ------------------------ @@ -69,8 +77,11 @@ if ~isempty( indC ) || ~isempty( indT ) end if ~isempty( temp ) && ~isempty( cond ) - tsg.SSPS_CAL = sw_salt( ... - cond/sw_c3515(), t90TOt68(temp), zeros(size(cond))); + +% Modification du 13/02/2009 +% tsg.SSPS_CAL = sw_salt( ... +% cond/sw_c3515(), t90TOt68(temp), zeros(size(cond))); + tsg.SSPS_CAL = sw_salt( cond/sw_c3515(), temp, zeros(size(cond))); end else diff --git a/tsg_util/t90TOt68.m b/tsg_util/t90TOt68.m deleted file mode 100644 index 15ade3f1d4d6e51867dc8e1aa963354c5293daa3..0000000000000000000000000000000000000000 --- a/tsg_util/t90TOt68.m +++ /dev/null @@ -1,7 +0,0 @@ -function [t68] = t90TOt68( t90 ) - -if ~isempty( t90 ) - t68 = 1.00024 * t90; -end - -end