From 270f9615ad2b988ef80030b37245a048dbfcf9a8 Mon Sep 17 00:00:00 2001
From: Jacques Grelet <jacques.grelet@ird.fr>
Date: Mon, 4 May 2015 14:11:07 +0000
Subject: [PATCH] some update about initialization of POSITION_QC
---
INSTALL | 8 ++++++++
tsg_io/readAsciiTsg.m | 4 ++++
tsg_io/readTsgDataLabview.m | 3 ++-
tsg_io/readTsgDataNuka.m | 9 +++++----
tsg_util/plot_Tsg.m | 3 +++
tsg_util/plot_Validation.m | 4 ++--
tsgqc.m | 6 +++---
7 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/INSTALL b/INSTALL
index f27a54a..814717a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -43,6 +43,14 @@ Installation:
ftp://ftp.ifremer.fr/ifremer/ird/us191/oceano/lib/matlab/woa05_monthly_surf.nc
ftp://ftp.ifremer.fr/ifremer/ird/us191/oceano/lib/matlab/woa05_seasonal_surf.nc
+ - La climatologie de surface ISAS13 du LPO est maintenant disponible:
+
+ ftp://ftp.ifremer.fr/ifremer/ird/us191/oceano/lib/matlab/isas13_annual_surf.nc
+ ftp://ftp.ifremer.fr/ifremer/ird/us191/oceano/lib/matlab/isas13_seasonal_surf.nc
+ ftp://ftp.ifremer.fr/ifremer/ird/us191/oceano/lib/matlab/isas13_monthly_surf.nc
+
+ Voir documentation sous: http://wwz.ifremer.fr/lpo/SO-Argo/Products/ISAS-T-S-fields
+
Pour les version de tsgqc <= 1.0RC4, recuperer les fichiers de climato
sous: ftp://ftp.ifremer.fr/ifremer/ird/us191/oceano/lib/matlab/old-climato
diff --git a/tsg_io/readAsciiTsg.m b/tsg_io/readAsciiTsg.m
index 82aa346..d000432 100644
--- a/tsg_io/readAsciiTsg.m
+++ b/tsg_io/readAsciiTsg.m
@@ -169,6 +169,10 @@ for i = 7 : nHeader
end
+% add POSITION_QC
+% ---------------
+tsg.POSITION_QC = int8(tsg.qc.hash.NO_CONTROL.code) * ones(nlines, 1, 'int8');
+
% populate tsg.file structure
% ---------------------------
[tsg.file.pathstr, tsg.file.name, tsg.file.ext] = ...
diff --git a/tsg_io/readTsgDataLabview.m b/tsg_io/readTsgDataLabview.m
index 2669392..935abf2 100644
--- a/tsg_io/readTsgDataLabview.m
+++ b/tsg_io/readTsgDataLabview.m
@@ -207,10 +207,11 @@ if fid ~= -1
% ----------------------------
tsg.qc.active.Code = tsg.qc.hash.NO_CONTROL.code;
- % Set salinity QC (SSPS_QC) par NOCONTROL code
+ % Set <PARAM>_QC with NOCONTROL code
% --------------------------------------------
tsg.SSPS_QC = castByteQC( tsg.qc.active.Code, noNaN );
tsg.SSJT_QC = castByteQC( tsg.qc.active.Code, noNaN );
+ tsg.POSITION_QC = castByteQC( tsg.qc.active.Code, noNaN );
% populate tsg.file structure
% ---------------------------
diff --git a/tsg_io/readTsgDataNuka.m b/tsg_io/readTsgDataNuka.m
index f000630..f36f86c 100644
--- a/tsg_io/readTsgDataNuka.m
+++ b/tsg_io/readTsgDataNuka.m
@@ -24,9 +24,9 @@ nbFieldNames = length( tsgNames );
% Get NO_CONTROL, GOOD, PROBABLY_GOOD codes
% -----------------------------------------
-NO_CONTROL = tsg.qc.hash.NO_CONTROL.code;
-GOOD = tsg.qc.hash.GOOD.code;
-PROBABLY_GOOD = tsg.qc.hash.PROBABLY_GOOD.code;
+NO_CONTROL = int8(tsg.qc.hash.NO_CONTROL.code);
+GOOD = int8(tsg.qc.hash.GOOD.code);
+PROBABLY_GOOD = int8(tsg.qc.hash.PROBABLY_GOOD.code);
% Display read file info on console
% ---------------------------------
@@ -107,7 +107,8 @@ tsg.SSPS = cellData{10};
% by default, SSPS flagged GOOD as data have been corrected by G. Reverdin
% ------------------------------------------------------------------------
-tsg.SSPS_QC=GOOD*ones(nrecords,1,'int32');
+tsg.SSPS_QC = GOOD * ones(nrecords, 1, 'int8');
+tsg.POSITION_QC = NO_CONTROL * ones(nrecords, 1, 'int8');
% check if there is data from external temperature sensor
% -------------------------------------------------------
diff --git a/tsg_util/plot_Tsg.m b/tsg_util/plot_Tsg.m
index 128dae5..76d0ddd 100644
--- a/tsg_util/plot_Tsg.m
+++ b/tsg_util/plot_Tsg.m
@@ -70,6 +70,9 @@ if ~isempty( X ) && ~isempty( Y )
end
else
+ if isempty(colVal)
+ colVal = 'k';
+ end
line( X, Y, 'Tag', ['TAG_PLOT' num2str(PlotNum) '_LINE_' para], ...
'LineStyle', lineType, ...
'Marker', markType, 'MarkerSize', markSize, 'Color', colVal);
diff --git a/tsg_util/plot_Validation.m b/tsg_util/plot_Validation.m
index 216d90a..c5e60c0 100644
--- a/tsg_util/plot_Validation.m
+++ b/tsg_util/plot_Validation.m
@@ -25,7 +25,7 @@ switch nPlot
% ------------------------
if ~isempty( tsg.(PARA) )
- % if lineType is selcted from menu option/preferences and ne 'none'
+ % if lineType is selected from menu option/preferences and ne 'none'
% -----------------------------------------------------------------
if ~strcmp(lineType, 'none')
@@ -85,7 +85,7 @@ switch nPlot
erase_Line( hPlotAxes, 3 );
% if ~isempty( tsg.(PARA) )
plot_Tsg( hMainFig, hPlotAxes, 3, tsg.DAYD, tsg.(PARA),[],...
- PARA, 'k', lineType, '*', 2);
+ PARA, '', lineType, '*', 2);
% end
end
diff --git a/tsgqc.m b/tsgqc.m
index 638d5a5..8a8d6b8 100644
--- a/tsgqc.m
+++ b/tsgqc.m
@@ -38,9 +38,9 @@ global GOSUD_FORMAT_VERSION
% version number, may be used to initialize some files when it change
% 0.90x -> 1.0RCx
% -------------------------------------------------------------------
-VERSION = 1.420; % -> 1.41
-CHAR_VERSION = '1.42';
-DATE_VERSION = '05 dec 2014';
+VERSION = 1.430; % -> 1.42
+CHAR_VERSION = '1.43';
+DATE_VERSION = '04 may 2015';
% netcdf file version, see DATA FORMAT TSG document:
% CORTSG_format_gosud.doc
--
GitLab