From 170fc9fc805c3c4732d2aa1d9056f708cefa0e81 Mon Sep 17 00:00:00 2001
From: Yves Gouriou <yves.gouriou@ird.fr>
Date: Tue, 11 Mar 2008 09:31:26 +0000
Subject: [PATCH] Ajout du module de calibration.m
---
tsg_io/readTsgDataLabview.m | 1 +
tsg_util/calibration.m | 2 ++
tsg_util/plot_Correction.m | 2 ++
3 files changed, 5 insertions(+)
diff --git a/tsg_io/readTsgDataLabview.m b/tsg_io/readTsgDataLabview.m
index 7a44159..1b2443b 100644
--- a/tsg_io/readTsgDataLabview.m
+++ b/tsg_io/readTsgDataLabview.m
@@ -153,6 +153,7 @@ if fid ~= -1
tsg.LONX = lon(noNaN);
tsg.SSJT = sst(noNaN);
tsg.SSPS = sss(noNaN);
+ tsg.CNDC = cond(noNaN);
tsg.SPDC = sog(noNaN);
tsg.SSJT_FREQ = tsg.SSJT_FREQ(noNaN);
tsg.CNDC_FREQ = tsg.CNDC_FREQ(noNaN);
diff --git a/tsg_util/calibration.m b/tsg_util/calibration.m
index 8ff5810..d79bdd5 100644
--- a/tsg_util/calibration.m
+++ b/tsg_util/calibration.m
@@ -13,6 +13,7 @@ else
msgbox( 'Conductivity not loaded',...
'Function ''Calibration''',...
'warn', 'modal');
+ return
end
if ~isempty( tsg.SSJT )
@@ -21,6 +22,7 @@ else
msgbox( 'Jacket temperature not loaded',...
'Function ''Calibration''',...
'warn', 'modal');
+ return
end
% Compute salinity - Use CSIRO functions
diff --git a/tsg_util/plot_Correction.m b/tsg_util/plot_Correction.m
index 233b526..f1e5f9c 100644
--- a/tsg_util/plot_Correction.m
+++ b/tsg_util/plot_Correction.m
@@ -37,6 +37,8 @@ VALUE_CHANGED = get(tsg.qc.hash, 'VALUE_CHANGED', 'code');
indVC = find( tsg.SSPS_ADJUSTED_QC == VALUE_CHANGED);
% Plot the difference tsg.SSPS_ADJUSTED-tsg.SSPS on axe 1
+% but only for records that were corrected using Water Sample
+% and not corrected with the calibration coefficients
% -------------------------------------------------------
plot_Tsg( hMainFig, hPlotAxes, 1,...
tsg.DAYD(indVC), tsg.SSPS_ADJUSTED(indVC)-tsg.SSPS(indVC),...
--
GitLab