Changeset 334

Timestamp:

03/02/2011 05:59:37 PM (12 years ago)

Author:

marcus

Message:

r173 | klaus | 2011-02-23 12:24:31 +0100 (Mi, 23 Feb 2011) | 1 line

format of EMSC file has changed some time ago; adjusted reading program for identify_phase

File:

• SH_SHM/trunk/source/motif/seismics.c (modified) (2 diffs)

SH_SHM/trunk/source/motif/seismics.c

@@ -1094 +1094 @@
                                 curdep = 33.0;
                         } /*endif*/
-                        if  (lptr[0] == 'm' && lptr[1] == 'b' && lptr[2] == ' ')  {
-                                lptr += 3;
+                        while  (*lptr == ' ')  lptr++;  /* now we should come to magnitude */
+                        if  (*lptr >= '0' && *lptr <= '9')  {
+                                /* here we found magnitude */
                                 sscanf( lptr, "%f", &curmag );
-                                while  (*lptr != ' ' && *lptr != '\n')  lptr++;  /* skip over magnitude */
-                                while  (*lptr == ' ')  lptr++;
+                        } else {
+                                curmag = -1.0;
                         } /*endif*/
-                        if  (lptr[0] == 'M' && lptr[1] == 'L' && lptr[2] == ' ')  {
-                                lptr += 3;
-                                sscanf( lptr, "%f", &curmag );
-                                while  (*lptr != ' ' && *lptr != '\n')  lptr++;  /* skip over magnitude */
-                                while  (*lptr == ' ')  lptr++;
-                        } /*endif*/
-                        if  (lptr[0] == 'M' && lptr[1] == 'S' && lptr[2] == ' ')  {
-                                lptr += 3;
-                                sscanf( lptr, "%f", &curmag );
-                                while  (*lptr != ' ' && *lptr != '\n')  lptr++;  /* skip over magnitude */
-                                while  (*lptr == ' ')  lptr++;
-                        } /*endif*/
-                        if  (lptr[0] == 'M' && lptr[1] == ' ' && lptr[2] >= '0' && lptr[2] <= '9')  {
-                                lptr += 2;
-                                sscanf( lptr, "%f", &curmag );
-                                while  (*lptr != ' ' && *lptr != '\n')  lptr++;  /* skip over magnitude */
-                                while  (*lptr == ' ')  lptr++;
-                        } /*endif*/
+                        while  (*lptr != ' ' && *lptr != '\n')  lptr++;  /* skip over mangitude */
+                        while  (*lptr == ' ')  lptr++;  /* now we should come to magnitude type */
+                        while  (*lptr != ' ' && *lptr != '\n')  lptr++;  /* skip over mangitude type */
                         tchar = *lptr;
                         if  (tchar == 'A')  { 
@@ -1148 +1134 @@
                                 /* if exclusive agency is set, accept only this */
                                 if  (*excl_agency != '\0'
-                                        && strcasecmp(excl_agency,infsrc[*evno]) != 0)
+                                        && strcasecmp(excl_agency,infsrc[*evno]) != 0)  {
+                                        if  (GpGetInt(cGpI_debug_level) > 3)
+                                                printf( "SHM-dbg4: skipped agency %s\n", infsrc[*evno] );
                                         continue;
-                                sprintf( tmpstr, "-%c", tchar );
-                                strcat( infsrc[*evno], tmpstr );
+                                } /*endif*/
+                                if  (tchar == 'M' || tchar == 'A')  {
+                                        sprintf( tmpstr, "-%c", tchar );
+                                        strcat( infsrc[*evno], tmpstr );
+                                } /*endif*/
                                 trav[*evno] = curtrav;
                                 lat[*evno] = curlat;