Changeset 386

Timestamp:

05/18/2011 12:20:31 PM (13 years ago)

Author:

marcus

Message:

obspy patches

Location:

SHX/trunk/SeismicHandler

Files:

• __init__.py (modified) (1 diff)
• patches/obspy.py (modified) (2 diffs)

SHX/trunk/SeismicHandler/__init__.py

@@ -20 +20 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
-# patching obspy's Trace and Stream
-from obspy.core import Trace, Stream
-from SeismicHandler.patches.obspy import *
-
-# traces in a stream are merge automatically
-Stream.__shx_init__, Stream.__init__ = Stream.__init__, streamAutoMergeInit
-Stream.__shx_append, Stream.append = Stream.append, streamAutoMergeAppend
-Stream.__shx_extend, Stream.extend = Stream.extend, streamAutoMergeExtend
-Stream.__shx_insert, Stream.insert = Stream.insert, streamAutoMergeInsert
-Stream.__shx_add__, Stream.__add__ = Stream.__add__, streamAutoMergeAdd
-
-# add method for faster plotting
-Trace.shx_prepareImageData = tracePrepareDataForImage
+# enable obspy patches
+from SeismicHandler.patches.Obspy import *

SHX/trunk/SeismicHandler/patches/obspy.py

@@ -26 +26 @@
 
 import numpy as np
+from obspy.core import Stream, Trace
 #from obspy.core import UTCDateTime
 
 __all__ = [
-    "streamAutoMergeInit",
-    "streamAutoMergeAppend",
-    "streamAutoMergeExtend",
-    "streamAutoMergeInsert",
-    "streamAutoMergeAdd",
-    "tracePrepareDataForImage",
+    "patched",
 ]
 
@@ -121 +117 @@
     else:
         norm = norm
+
+# traces in a stream are merge automatically
+Stream.__shx_init__, Stream.__init__ = Stream.__init__, streamAutoMergeInit
+Stream.__shx_append, Stream.append = Stream.append, streamAutoMergeAppend
+Stream.__shx_extend, Stream.extend = Stream.extend, streamAutoMergeExtend
+Stream.__shx_insert, Stream.insert = Stream.insert, streamAutoMergeInsert
+Stream.__shx_add__, Stream.__add__ = Stream.__add__, streamAutoMergeAdd
+
+# add method for faster plotting
+Trace.shx_prepareImageData = tracePrepareDataForImage
+
+patched = True