Changeset 154

Timestamp:

09/30/2009 05:10:27 PM (14 years ago)

Author:

marcus

Message:

• new tests
• fixed spelling
• fixed access of trace info entries
• create traces from numpy data (some double free issue remains)
• minor debug plot adjustments

Location:

SHX/trunk/src/SeismicHandler

Files:

• core/modules/Trace.py (modified) (7 diffs)
• core/shlib.py (modified) (4 diffs)
• tests/test_trace.py (added)
• tests/test_traces.py (modified) (2 diffs)

SHX/trunk/src/SeismicHandler/core/modules/Trace.py

@@ -59 +59 @@
             self.update(memblc=kwargs.get("memblc"))
 
+        # create new trace from numpy data
+        # additional information required - at least delta
+        if kwargs.has_key("data") and kwargs.has_key("delta"):
+            self._create(**kwargs)
+
     def __len__(self):
         """return number of samples"""
@@ -93 +98 @@
                     raise InfoEntryReadOnlyError(name.upper())
 
-                self.__dict__["_info"][name] = value
+                self.__dict__["_info"][name.upper()] = value
                 shlib().setInfoEntry(self.address, name, value)
 
@@ -173 +178 @@
         self._info = info
 #        self.listInfo()
+
+    def _create(self, **kwargs):
+        slib = shlib().sh
+        slib.db_newlist()
+
+        slib.db_create.restype = C.POINTER(MEMBLC)
+
+        status = C.c_int(0)
+        memblc = slib.db_create(C.byref(status))
+
+        slib.ml_inittrc.argtypes = [C.POINTER(MEMBLC), C.POINTER(C.c_float), C.c_int, C.c_float]
+        slib.ml_inittrc(memblc, kwargs["data"], len(kwargs["data"]), kwargs["delta"])
+
+        self.address = C.addressof(memblc.contents)
+        self.update(memblc=memblc.contents)
 
 class Traces(object):
@@ -278 +298 @@
         from SeismicHandler.core.modules.Graphics import pylab
 
-        fig = pylab.figure()
+        fig = pylab.figure(figsize=(12,7))
         fig.canvas.set_window_title("SHX - plot of %u traces" % len(self))
-        pylab.subplots_adjust(hspace=0.1, wspace=20, left=0.1, right=0.95, bottom=0.05, top=0.95)
+        pylab.subplots_adjust(hspace=0.1, wspace=20, left=0.1, right=0.98, bottom=0.07, top=0.95)
 
         fig.set_facecolor('w')
 
+        maxx = 0
         for i, trc in enumerate(self):
             # link x axis if more than one trace
@@ -297 +318 @@
             ax.yaxis.set_major_locator(pylab.NullLocator())
 
-            # build label from station ...
+            # build label from number...
+            label = "%u: " % (i+1,)
+            # ... station ...
             if trc.station:
-                label = trc.station
+                label += trc.station
+            else:
+                label += "-?-"
             # ... and component name
             if trc.comp:
                 label += " " + trc.comp
+            else:
+                label += " -?-"
 
             try:
@@ -314 +341 @@
             else:
                 ax.xaxis.tick_bottom()
-
-            pylab.plot(np.arange(0, trc.delta * trc.length, trc.delta), trc.fetchData(), "k", linewidth=.5)
+                ax.set_xlabel("time in seconds")
+
+            duration = trc.delta * trc.length
+            pylab.plot(np.arange(0, duration, trc.delta), trc.fetchData(), "k", linewidth=.5)
+
+            maxx = duration > maxx and duration or maxx
 
             # add some extra space around traces
             limit = abs(max(pylab.ylim(), key=abs)) * 1.1
             pylab.ylim(-limit, limit)
+
+        # set identical maximum x dimension for all traces
+        for i in fig.axes:
+            i.axis(xmax=maxx)
 
         if save:
@@ -327 +362 @@
 
 if __name__ == "__main__":
-    t = Traces()
     from SeismicHandler.core.commands import Run
 
-    MessageService.block(Message(MessageService.REDRAW))
+    data = np.random.randn(1500).astype(np.float32)
+    x = Trace(data=(C.c_float*len(data)).from_address(data.ctypes.get_data()), delta=.05)
+    x.station = "testx".upper()
+    x.comp = "N"
+    x.chan1 = "B"
+    x.chan2 = "H"
+
+    data2 = np.random.randn(1800).astype(np.float32)
+    y = Trace(data=(C.c_float*len(data2)).from_address(data2.ctypes.get_data()), delta=.05)
+
     # create 2 hours of synthetic data (100 Hz)
     # position set by counter
     for i in range(5):
-        Run("CREATE SHARP 0.05 100 1. %u .1 .5" % (10+i*6))
+        Run("CREATE SHARP 0.05 100 10. %u .1 .5" % (10+i*6))
 #        Run("create sharp 0.1 7200 1 %u 0.005 .05" % 5**(i+1))
 
     Run("sum all")
-    MessageService.unblock(Message(MessageService.REDRAW))
-
-    t.plot(True)
+
+    t = Traces()
+    t.plot()

SHX/trunk/src/SeismicHandler/core/shlib.py

@@ -81 +81 @@
 
         # somewhat needless, since c lib doesn't deal which command line parameters
-        status= C.c_int()
+        status = C.c_int()
         CSTR_ARRAY = C.c_char_p * 1
         argv = CSTR_ARRAY("")
@@ -144 +144 @@
                "char": "db_setc",
                "real": "db_setr",
-               "flag": "db_setf", # XXX 
+               "flag": "db_setf", # XXX
                "pointer": "db_setp", # XXX not needed (still unchangeable)
                "time": "db_sett",
@@ -176 +176 @@
 #        self.call(StringIO("SHSTRTUP"))
 #        return
-    
+
         self.call(StringIO("wdw/dc=s/ic=s/main"))
         self.call(StringIO("wdw/ic=s"))
@@ -228 +228 @@
             except StopIteration:
                 break
-            
-            # make changeable string (strings in python may no be altered!) 
+
+            # make changeable string (strings in python may no be altered!)
             cmdstr = C.create_string_buffer(cmdstr)
 

SHX/trunk/src/SeismicHandler/tests/test_traces.py

@@ -8 +8 @@
 import unittest
 
-class eventsTestCase(unittest.TestCase):
+class tracesTestCase(unittest.TestCase):
     def setUp(self):
         Run("cresharp")
@@ -192 +192 @@
 
 def suite():
-    return unittest.makeSuite(eventsTestCase, 'test')
+    return unittest.makeSuite(tracesTestCase, 'test')
 
 if __name__ == "__main__":