Changeset 108 for SH_SHM/trunk

Timestamp:

03/25/2009 11:14:12 AM (14 years ago)

Author:

marcus

Message:

r80 | svn | 2009-03-17 08:58:51 +0100 (Di, 17 Mär 2009) | 1 line

fixed bug in check_evt; open new mseed file when record length changes (seed_tidy); additional station info

Location:

SH_SHM/trunk

Files:

• inputs/STATINF.DAT (modified) (3 diffs)
• inputs/filter_lookup.txt (modified) (1 diff)
• inputs/sensitivities.txt (modified) (2 diffs)
• source/seed_io/seed_tidy.c (modified) (1 diff)
• util/check_evt.c (modified) (4 diffs)

SH_SHM/trunk/inputs/STATINF.DAT

@@ -13 +13 @@
 GRC4 lat:+49.0867465 lon: +11.5262720 elevation: 503.0 array:01 xrel: 22.280903 yrel: -67.175827 name:Graefenberg,_F.R.G.
 ASSE    lat:+52.130             lon: +10.673    elevation: -308.6 array:01 xrel:-37.356739      yrel:271.203522
+AHRW    lat:50.541      lon: 7.076
 BFO     lat:+48.3301    lon: +08.3296   elevation: 589.0        array:01        xrel:-213.690201        yrel:-151.307358        name:FRG,_Black_Forest
 BRG     lat:+50.8732    lon: +13.9428   elevation: 296.0        array:01 xrel: 191.024750       yrel: 131.459930        name:FRG,_BERGGIESHUEBEL
@@ -48 +49 @@
 HAM     lat:+53.4650    lon: +09.9247   elevation: 30.25        array:01        xrel: -85.759567        yrel: 419.642181        name:FRG,_Hamburg
 HAM3 lat:53.56558   lon:9.97455 elevation:10.0
+OBER lat:47.40691   lon:10.29338 elevation: 908
+UBR  lat:47.680     lon:10.107   elevation:890
 LID   lat:+54.5481      lon: +13.3664   elevation: 0.00 array:01        xrel: 138.407028        yrel: 540.072083        name:GRF,_Liddow
 WERN    lat:+50.2874    lon: +12.3761   elevation: 600.0        array:01        xrel:  82.111969        yrel:  66.324837
@@ -597 +600 @@
 FUCH lat:+49.921     lon: +12.138     elevation: 610.                                      name:KTB-Netz,Germany
 SCHN lat:+50.053     lon: +11.854     elevation:1040.                                      name:Fuerstenfeldbruck-Netz,Germany
+HROE lat:+50.536     lon: +10.156     elevation: 569.                                      name:Bayern-Netz,Germany
 BINY  lat:+42.0896      lon: -75.9708     name:New_York
 HTL     lat:+50.99430000        lon:  -4.48490000

SH_SHM/trunk/inputs/filter_lookup.txt

@@ -12 +12 @@
 ASSE-HH-N GRSN
 ASSE-HH-E GRSN
+AHRW-BH-Z GRSN
+AHRW-BH-N GRSN
+AHRW-BH-E GRSN
+AHRW-HH-Z GRSN
+AHRW-HH-N GRSN
+AHRW-HH-E GRSN
 GRA5-BH-Z GRSN
 GRA5-BH-N GRSN

SH_SHM/trunk/inputs/sensitivities.txt

@@ -2 +2 @@
 !      =================
 !
-! $Revision: 75 $, $Date: 2009-01-29 09:33:07 +0100 (Do, 29 Jan 2009) $
+! $Revision: 80 $, $Date: 2009-03-17 08:58:51 +0100 (Di, 17 MÀr 2009) $
 !
 ! Sensitivity file for data streams
@@ -466 +466 @@
 nrdl-hh-?   ...                ...                 1.5895
 
+ober-bh-?   ...                ...                 1.059
+ober-hh-?   ...                ...                 1.059
+ober-lh-?   ...                ...                 1.059
+
 obka-bh-?   ...                ...                 1.67
 

SH_SHM/trunk/source/seed_io/seed_tidy.c

@@ -884 +884 @@
         if  (F_ONEFILE & flags)
                 switch_days = switch_hours = FALSE;
+
+    /* new file if the record lenth changes */
+    this_reclth = SeedGetReclth( (SeedDataHeaderT *)rec, FALSE );
+    if  (last_reclth > 0 && this_reclth != last_reclth)
+        new_file = TRUE;
 
         /* find out whether to open new file */

SH_SHM/trunk/util/check_evt.c

@@ -36 +36 @@
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include BASECNST
 #include BC_SYSBASE
@@ -120 +121 @@
                 efv_showinitials = (strcmp(argv[3],"showinitials") == 0);
 
+#ifdef XXX
         /* efv_infile is used for messages, directory will be removed */
         i = strlen( infile ) - 1;
@@ -125 +127 @@
                 i--;
         strcpy( efv_infile, infile+i );
+#endif
+    strcpy( efv_infile, infile );
 
         status = EveNOERROR;
@@ -132 +136 @@
     /* now call the Python script for additional checks */
     if  (strcmp(outfile,"TT") == 0)  {
-        sprintf( tmpstr, "%s/CheckEvt.py %s", getenv("SH_UTIL"), efv_infile );
+        sprintf( tmpstr, "%s/CheckEvt.py %s", (char *)getenv("SH_UTIL"),
+            efv_infile );
         system( tmpstr );
     } else {
-        sprintf( tmpstr, "%s/CheckEvt.py %s %s", getenv("SH_UTIL"),
+        sprintf( tmpstr, "%s/CheckEvt.py %s %s", (char *)getenv("SH_UTIL"),
             efv_infile, outfile );
         system( tmpstr );