Changeset 326

Timestamp:

02/17/2011 12:16:59 PM (13 years ago)

Author:

marcus

Message:

r165 | klaus | 2011-02-17 12:03:57 +0100 (Do, 17 Feb 2011) | 1 line

handle data record identifier M; also in split_seed

Location:

SH_SHM/trunk

Files:

• inputs/LocalSensitivities.dat (modified) (1 diff)
• inputs/chantrans.txt (modified) (3 diffs)
• inputs/sensitivities.txt (modified) (2 diffs)
• source/seed_io/seed_lib.c (modified) (5 diffs)
• source/seed_io/seedcfg.h (modified) (2 diffs)
• source/seed_io/split_seed.c (modified) (1 diff)

SH_SHM/trunk/inputs/LocalSensitivities.dat

@@ +1 @@
+a803-hh-?   ...                ...                 3.9725
+a807-hh-?   ...                ...                 3.9725
+
 gor1-hh-?   11-Nov-2009        ...                 0.1877
 gor1-bh-?   11-Nov-2009        ...                 0.1877

SH_SHM/trunk/inputs/chantrans.txt

@@ -5 +5 @@
 
 
-a803-++   hh
-a807-++   hh
 ahrw-++   hh
 asse-++   hh
@@ -77 +75 @@
 zerf-++   hh
 
+gor1-++   hh
+gor2-++   hh
+gor3-++   hh
+gor4-++   hh
+gor5-++   hh
+
 han0-++   dh
 han1-++   dh
@@ -89 +93 @@
 a055-++   hh
 p180-++   dh
+
+a803-++   hh
+a807-++   hh
+clnz-++   hh
 
 gea0-++   sh

SH_SHM/trunk/inputs/sensitivities.txt

@@ -2 +2 @@
 !      =================
 !
-! $Revision: 156 $, $Date: 2011-02-08 14:26:10 +0100 (Di, 08 Feb 2011) $
+! $Revision: 165 $, $Date: 2011-02-17 12:03:57 +0100 (Do, 17 Feb 2011) $
 !
 ! Sensitivity file for data streams
@@ -441 +441 @@
 ham-lh-?    ...                ...                 1.67
 
+ham3-bh-?   ...                ...                 1.67
+ham3-hh-?   ...                ...                 1.67
+ham3-lh-?   ...                ...                 1.67
+
 henn-hh-?   20-may-2010        ...                 0.8750
 

SH_SHM/trunk/source/seed_io/seed_lib.c

@@ -3 +3 @@
  *      ==========
  *
- * $Revision: 164 $, $Date: 2011-02-16 10:01:41 +0100 (Mi, 16 Feb 2011) $
+ * $Revision: 165 $, $Date: 2011-02-17 12:03:57 +0100 (Do, 17 Feb 2011) $
  *
  * SEED library
@@ -4013 +4013 @@
 
 #define IDOFFSET 6
-#define DATCHARS "DQRM"
 
 
@@ -4053 +4052 @@
         if  (id1 == EOF || isdigit1 == FALSE)  {
                 /* no SEED file, leave recsize zero */
-        } else if  (strchr(DATCHARS,id1) != NULL && strchr(DATCHARS,id2) == NULL)  {
+        } else if  (strchr(Seed_C_DATCHARS,id1) != NULL && strchr(Seed_C_DATCHARS,id2) == NULL)  {
                 /* definitely not 512 */
                 *recsize = 4096;
                 *byteoff = 0;
-        } else if  (id1 == 'V' && strchr(DATCHARS,id2) != NULL && isdigit2 == TRUE)  {
+        } else if  (id1 == 'V' && strchr(Seed_C_DATCHARS,id2) != NULL && isdigit2 == TRUE)  {
                 /* very likely 512 */
                 *recsize = 512;
@@ -4064 +4063 @@
                 *recsize = 4096;
                 *byteoff = 0;  /* this is a guess */
-        } else if  (strchr(DATCHARS,id1) != NULL && strchr(DATCHARS,id2) != NULL)  {
+        } else if  (strchr(Seed_C_DATCHARS,id1) != NULL && strchr(Seed_C_DATCHARS,id2) != NULL)  {
                 *byteoff = 0;
                 fseek( fp, 1024+IDOFFSET, 0 );
@@ -4070 +4069 @@
                 fseek( fp, 1024+512+IDOFFSET, 0 );
                 id2 = getc( fp );
-                if  (strchr(DATCHARS,id1) != NULL && strchr(DATCHARS,id2) != NULL)  {
+                if  (strchr(Seed_C_DATCHARS,id1) != NULL && strchr(Seed_C_DATCHARS,id2) != NULL)  {
                         *recsize = 512;
-                } else if  (strchr(DATCHARS,id1) != NULL && id2 == EOF)  {
+                } else if  (strchr(Seed_C_DATCHARS,id1) != NULL && id2 == EOF)  {
                         *recsize = 512;
                 } else if  (id1 == EOF)  {

SH_SHM/trunk/source/seed_io/seedcfg.h

@@ -3 +3 @@
  *      =========
  *
- * $Revision: 147 $, $Date: 2011-01-13 09:13:13 +0100 (Do, 13 Jan 2011) $
+ * $Revision: 165 $, $Date: 2011-02-17 12:03:57 +0100 (Do, 17 Feb 2011) $
  *
  * SEED basic constants and types
@@ -155 +155 @@
 #define Seed_C_EmptyAddinfStr "...."
 
+/* this characters can appear in a data record header */
+#define Seed_C_DATCHARS "DQRM"
+
 /* data formats (should not be here ...) */
 #define Seed_C_FORMAT_MSEED 1

SH_SHM/trunk/source/seed_io/split_seed.c

@@ -144 +144 @@
                         return 1;
                 } /*endif*/
-                if  (seedrec[6] != 'D' && seedrec[6] != 'Q' && seedrec[6] != 'R')  continue;
+                if  (strchr(Seed_C_DATCHARS,seedrec[6]) == NULL)  continue;
                 strncpy( curr_station, seedhdr->statcode, 5 );
                 curr_station[5] = '\0';