Changeset 1236

Timestamp:

04/07/2020 04:56:53 PM (3 years ago)

Author:

klaus

Message:

bugfixes

Location:

SHX/trunk/SeismicHandler

Files:

• cmdscripts/READ_GERMAN_STATIONS.SHC (modified) (2 diffs)
• commands/magnitude.py (modified) (2 diffs)
• patches/obspy_.py (modified) (1 diff)
• tools/netstodb.s (modified) (1 diff)

SHX/trunk/SeismicHandler/cmdscripts/READ_GERMAN_STATIONS.SHC

@@ -7 +7 @@
 sdef lon 11.6156
 
+echo perf__ reading starts at $systime
 fdsnws |"lat|,|"lon|,|6.| * * ?h? #1 #2
 fdsnws |"lat|,|"lon|,|6.| * * ?h? #1 #2 /addr=eth /excludenets=z3,s
-fdsnws |"lat|,|"lon|,|6.| * * ?h? #1 #2 /addr=lmu
+fdsnws |"lat|,|"lon|,|6.| * * ?h? #1 #2 /addr=lmu /excludenets=z3
 fdsnws |"lat|,|"lon|,|6.| * * ?h? #1 #2 /addr=resif /excludenets=z3
-fdsnws |"lat|,|"lon|,|6.| * * ?h? #1 #2 /addr=orfeus
+fdsnws |"lat|,|"lon|,|6.| * * ?h? #1 #2 /addr=orfeus /excludenets=z3,nl
 fdsnws |"lat|,|"lon|,|6.| * * ?h? #1 #2 /addr=gfz /excludenets=z3
+echo perf__ reading ended at $systime
+echo perf__ $tottrcs traces read
 chanselect hh,eh,bh ,00,10,11
+echo perf__ meta started at $systime
 meta all complete /addr=gfz
 meta all complete /addr=orfeus
@@ -20 +24 @@
 meta all complete /addr=eth
 meta all complete /del_incomplete
+echo perf__ meta ended at $systime
+echo perf__ $tottrcs traces remained
 
 

SHX/trunk/SeismicHandler/commands/magnitude.py

@@ -428 +428 @@
     
     def determineMagnitudeMl( self, trc, stime, etime, degdist ):
+        if stime >= etime:
+            return None
         # find horizontals
         horizcomp = "NE12XY"
@@ -450 +452 @@
             sl = trc.slice_relative( stime, etime )
             #ampl.append( max( abs(max(sl.data)), abs(min(sl.data)) ) )
+            if len(sl.data) < 10:
+                print "dbg: short data on", trc.stats.station, trc.stats.channel
+                return None
             mean = sl.data.mean()
             ampl.append( max(sl.data.max()-mean, mean-sl.data.min()) )

SHX/trunk/SeismicHandler/patches/obspy_.py

@@ -482 +482 @@
     if end > hi:
         end = hi
-
+    
     start = self.stats.starttime + start - torigin
     end = self.stats.starttime + end - torigin
+    
+    if start > end:
+        end = start
 
     return self.slice(start, end)

SHX/trunk/SeismicHandler/tools/netstodb.s

@@ +1 @@
+# update station metadata for SHX doing magnitude estimations:
+# run this script on smpc52: 'source netstodb.s'
+# copy DB file to shx1f: 'scp ~/.shx/inventory.db detector@shx1f:.shx/'
 ~/svn/SHX/SeismicHandler/tools/FdsnMeta2Db.py SX,TH,GR BGR
 ~/svn/SHX/SeismicHandler/tools/FdsnMeta2Db.py CH ETH