corrections sur la lecture des fichiers Astrolabe + passage par defaut en...

corrections sur la lecture des fichiers Astrolabe + passage par defaut en longitude [-180 180] a la lecture

tsg_io/readTsgDataAstrolabe.m

@@ -101,7 +101,7 @@ end
 %     %HEADER YEAR MNTH DAYX hh mm ss
 % 2 - The 4 Date and time parametes are read in %d
 % -------------------------------------------------------------
-format = '%s %d %d %d';
+format = '%d %d %d %d';
 for i = 5 : nHeader
   format = [format ' %f'];
 end
@@ -118,13 +118,24 @@ clear cellData
 
 % Date (y m d h m s) in the first 4 elements in data
 % --------------------------------------------------
-ddmmyy = char(s.(char(header(1)))) ;
-dd = str2num(ddmmyy(:,1:2));
-mm = str2num(ddmmyy(:,3:4));
+% ddmmyy = char(s.(char(header(1)))) ;
+% dd = str2num(ddmmyy(:,1:2));
+% mm = str2num(ddmmyy(:,3:4));
+ddmmyy = double(s.(char(header(1)))) ;
+nn = length(ddmmyy);
+dd = repmat(NaN, [nn 1]);
+mm = repmat(NaN, [nn 1]);
+yy = repmat(NaN, [nn 1]);
+for it = 1:nn
+    ddmmyy_str = sprintf('%06d', ddmmyy(it));
+    dd(it) = str2num(ddmmyy_str(:,1:2));
+    mm(it) = str2num(ddmmyy_str(:,3:4));
+    yy(it) = 2000 + str2num(ddmmyy_str(:,5:6));
+end
 
 % Warning: for post-2000 files only!
 % ----------------------------------
-yy = 2000 + str2num(ddmmyy(:,5:6));
+%yy = 2000 + str2num(ddmmyy(:,5:6));
 
 hh = double( s.(char(header(2))) );
 mi = double( s.(char(header(3))) );
@@ -167,13 +178,17 @@ miss=-90;
 % SSPS_ADJUSTED and SSTP flagged GOOD
 % -------------------------------------------------------
 
-tsg.SSTP_QC=repmat(GOOD,[length(tsg.DAYD) 1]);
+if ~isempty(tsg.SSTP)
+    tsg.SSTP(tsg.SSTP<miss)=nan;
+    tsg.SSTP_QC(isnan(tsg.SSTP))=nan;
+    tsg.SSTP_QC=repmat(GOOD,[length(tsg.DAYD) 1]);
+end
+
 tsg.SSPS_QC=repmat(PROBABLY_BAD,[length(tsg.DAYD) 1]);
 tsg.SSPS_ADJUSTED_QC=repmat(GOOD,[length(tsg.DAYD) 1]);
-tsg.SSTP(tsg.SSTP<miss)=nan;
 tsg.SSPS(tsg.SSPS<miss)=nan;
 tsg.SSJT(tsg.SSJT<miss)=nan;
-tsg.SSTP_QC(isnan(tsg.SSTP))=nan;
+tsg.SSPS_ADJUSTED(tsg.SSPS_ADJUSTED<miss)=nan;
 tsg.SSPS_QC(isnan(tsg.SSPS))=nan;
 tsg.SSPS_ADJUSTED_QC(isnan(tsg.SSPS))=nan;
 

tsg_util/updateTsgStruct.m

@@ -29,7 +29,11 @@ PARA  = ['SSPS'; 'SSJT'];
 s = tsg.qc.hash.NO_CONTROL;
 NO_CONTROL = s.code;
 
-% Suppress longitude discontinuity at -180 or 180 crossing 
+% shift to [-180 180] longitude by default
+% ----------------------------------------
+tsg.LONX = mod(tsg.LONX+180,360)-180;
+
+% Suppress longitude discontinuity at -180 or 180 crossing
 % --------------------------------------------------------
 deflon = find(isfinite(tsg.LONX));
 dlon = diff(tsg.LONX(deflon));