From 1e78ffcfe963f0394026cb5e60b11c7c5b5dd9fb Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Mon, 7 Feb 2022 13:03:18 +0100 Subject: [PATCH 1/4] fix start time extraction --- Tools/getFileAndEQseconds.m | 68 +++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/Tools/getFileAndEQseconds.m b/Tools/getFileAndEQseconds.m index 9c18a66..6073443 100755 --- a/Tools/getFileAndEQseconds.m +++ b/Tools/getFileAndEQseconds.m @@ -11,6 +11,16 @@ % Windows user can try a renamer , for example 1-4aren (one-for all renamer) % http://www.1-4a.com/rename/ perhaps this adress is still valid +%========================================================================== +% Yvonne Fröhlich (YF), Karlsruhe Institute of Technology (KIT), +% Email: yvonne.froehlich@kit.edu +% July-December 2021 +% +% modifications to fix extraction of start time by SplitLab +% (unconsidered milliseconds or seconds of start time) +% +%========================================================================== + global config @@ -22,22 +32,37 @@ catch sac = sl_rsacsun([config.datadir filesep F(k,:)]); end - [FIyyyy(k), FIddd(k), FIHH(k), FIMM(k), FISS(k)] =... - sl_lh(sac, 'NZYEAR','NZJDAY','NZHOUR','NZMIN', 'NZSEC'); +% [FIyyyy(k), FIddd(k), FIHH(k), FIMM(k), FISS(k)] =... +% sl_lh(sac, 'NZYEAR','NZJDAY','NZHOUR','NZMIN', 'NZSEC'); + [FIyyyy(k), FIddd(k), FIHH(k), FIMM(k), FISS(k), FImmm(k)] =... + sl_lh(sac, 'NZYEAR','NZJDAY','NZHOUR','NZMIN', 'NZSEC', 'NZMSEC'); % YF add msec 2021/06/24 Omarker(k) = sl_lh(sac, 'O'); end Omarker(Omarker == -12345) = 0; %verify, if O-marker is set - FIsec = FISS + FIMM*60 + FIHH*3600 + (FIddd)*86400 + Omarker; +% FIsec = FISS + FIMM*60 + FIHH*3600 + (FIddd)*86400 + Omarker; + FIsec = FImmm/1000 + FISS + FIMM*60 + FIHH*3600 + (FIddd)*86400 + Omarker; % YF add msec 2021/06/24 fclose all; else % USE FILENAME + + % YF add warning 2021/Nov/28 + msgbox( {'When extracting the \bfstart time\rm from the \bffile name\rm be sure that this time is \bf\itreally\rm the exact \bfstart time\rm of the \bftrace!'}, ... + 'Check start time' ,'warn', ... + struct('WindowStyle',{'modal'},'Interpreter',{'tex'}) ); + switch config.FileNameConvention case 'mseed2sac1' % mseed2sac format: QT.ANIL.00.HHZ.D.2012,321,18:00:00.SAC + + % YF add warning 2021/Nov/28 + msgbox( 'Only correct for traces with start times of \bfzero milliseconds\rm!', ... + 'Check milliseconds' ,'warn', ... + struct('WindowStyle',{'modal'},'Interpreter',{'tex'}) ); + FIsec = zeros(1,length(F(:,1))); FIyyyy = zeros(1,length(F(:,1))); @@ -72,6 +97,12 @@ case 'mseed2sac2' % seems mseed2sac changed naming convention... % mseed2sac format: IU.HRV.00.BH1.M.2011.246.044859.SAC + + % YF add warning 2021/Nov/28 + msgbox( 'Only correct for traces with start times of \bfzero milliseconds\rm!', ... + 'Check milliseconds' ,'warn', ... + struct('WindowStyle',{'modal'},'Interpreter',{'tex'}) ); + FIsec = zeros(1,length(F(:,1))); FIyyyy = zeros(1,length(F(:,1))); @@ -118,6 +149,12 @@ case 'SEISAN' % SEISAN format '2003-05-26-0947-20S.HOR___003_HORN__BHZ__SAC' + + % YF add warning 2021/Nov/28 + msgbox( 'Only correct for traces with start times of \bfzero milliseconds\rm!', ... + 'Check milliseconds' ,'warn', ... + struct('WindowStyle',{'modal'},'Interpreter',{'tex'}) ); + FIyyyy = str2num(F(:,1:4)); FImonth= str2num(F(:,6:7)); FIdd = str2num(F(:,9:10)); @@ -131,6 +168,12 @@ case 'YYYY.JJJ.hh.mm.ss.stn.sac.e' % Format: 1999.136.15.25.00.ATD.sac.z + + % YF add warning 2021/Nov/28 + msgbox( 'Only correct for traces with start times of \bfzero milliseconds\rm!', ... + 'Check milliseconds' ,'warn', ... + struct('WindowStyle',{'modal'},'Interpreter',{'tex'}) ); + FIyyyy = str2num(F(:,1:4)); FIddd = str2num(F(:,6:8)); FIHH = str2num(F(:,10:11)); @@ -140,6 +183,12 @@ case 'YYYY.MM.DD-hh.mm.ss.stn.sac.e'; % Format: 2003.10.07-05.07.15.DALA.sac.z + + % YF add warning 2021/Nov/28 + msgbox( 'Only correct for traces with start times of \bfzero milliseconds\rm!', ... + 'Check milliseconds' ,'warn', ... + struct('WindowStyle',{'modal'},'Interpreter',{'tex'}) ); + FIyyyy = str2num(F(:,1:4)); FImonth= str2num(F(:,6:7)); FIdd = str2num(F(:,9:10)); @@ -152,6 +201,12 @@ case 'YYYY_MM_DD_hhmm_stnn.sac.e'; % Format: 2005_03_02_1155_pptl.sac (LDG/CEA data) + + % YF add warning 2021/Nov/28 + msgbox( 'Only correct for traces with start times of \bfzero seconds\rm!', ... + 'Check seconds' ,'warn', ... + struct('WindowStyle',{'modal'},'Interpreter',{'tex'}) ); + FIyyyy = str2num(F(:,1:4)); FImonth= str2num(F(:,6:7)); FIdd = str2num(F(:,9:10)); @@ -163,6 +218,13 @@ case 'stn.YYMMDD.hhmmss.e' % Format: fp2.030723.213056.X (BroadBand OBS data) + + % YF add warning 2021/Nov/28 + msgbox( {'Only correct for traces with start times of \bfzero milliseconds\rm!'; ... + 'Only correct for \bfyear 2000 or later\rm!'}, ... + 'Check milliseconds and year' ,'warn', ... + struct('WindowStyle',{'modal'},'Interpreter',{'tex'}) ); + FIyyyy = 2000 + str2num(F(:,5:6));%only two-digit year identifier => add 2000, assuming no OBS data before 2000 FImonth= str2num(F(:,7:8)); FIdd = str2num(F(:,9:10)); From c25881f507320fd43404987f196f45e9b24ea091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yvonne=20Fr=C3=B6hlich?= <94163266+yvonnefroehlich@users.noreply.github.com> Date: Tue, 12 Jul 2022 16:06:40 +0200 Subject: [PATCH 2/4] update YF's contact infos --- Tools/getFileAndEQseconds.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Tools/getFileAndEQseconds.m b/Tools/getFileAndEQseconds.m index 6073443..c0f35bb 100755 --- a/Tools/getFileAndEQseconds.m +++ b/Tools/getFileAndEQseconds.m @@ -12,11 +12,12 @@ % http://www.1-4a.com/rename/ perhaps this adress is still valid %========================================================================== +% July-December 2021 % Yvonne Fröhlich (YF), Karlsruhe Institute of Technology (KIT), +% ORCID: 0000-0002-8566-0619 % Email: yvonne.froehlich@kit.edu -% July-December 2021 -% -% modifications to fix extraction of start time by SplitLab +% GitHub: https://github.com/yvonnefroehlich/SplitLab-TemporalAlignment +% => modifications to fix extraction of start time by SplitLab % (unconsidered milliseconds or seconds of start time) % %========================================================================== From 9d0803481758c9a94bc593ab42c6b763c1cefd65 Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Tue, 4 Oct 2022 11:25:30 +0200 Subject: [PATCH 3/4] Add reference to paper Froehlich et al. (2022) --- Tools/getFileAndEQseconds.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tools/getFileAndEQseconds.m b/Tools/getFileAndEQseconds.m index c0f35bb..ca44d4d 100755 --- a/Tools/getFileAndEQseconds.m +++ b/Tools/getFileAndEQseconds.m @@ -19,6 +19,8 @@ % GitHub: https://github.com/yvonnefroehlich/SplitLab-TemporalAlignment % => modifications to fix extraction of start time by SplitLab % (unconsidered milliseconds or seconds of start time) +% publication: Fröhlich, Grund, Ritter (2022) Annals of Geophysics +% https://doi.org/10.4401/ag-8781 % %========================================================================== From bcb26b89175e0b46876063172789dbcf64ca5961 Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Tue, 4 Oct 2022 12:30:49 +0200 Subject: [PATCH 4/4] Use upper-case letter --- Tools/getFileAndEQseconds.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/getFileAndEQseconds.m b/Tools/getFileAndEQseconds.m index ca44d4d..9d294f9 100755 --- a/Tools/getFileAndEQseconds.m +++ b/Tools/getFileAndEQseconds.m @@ -19,7 +19,7 @@ % GitHub: https://github.com/yvonnefroehlich/SplitLab-TemporalAlignment % => modifications to fix extraction of start time by SplitLab % (unconsidered milliseconds or seconds of start time) -% publication: Fröhlich, Grund, Ritter (2022) Annals of Geophysics +% Publication: Fröhlich, Grund, Ritter (2022) Annals of Geophysics % https://doi.org/10.4401/ag-8781 % %==========================================================================